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
U-Zyn Chua
bcdbdc8108
Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK(). Fixes #3531
2013-01-15 09:17:24 +08:00
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
mark_story
374631dc8c
Fix skip condition.
2012-11-14 21:42:40 -05:00
mark_story
9011b42bb4
Add skip if response is invalid.
2012-11-14 21:35:58 -05:00
Ceeram
e02eab05d5
Remove all todo from core, create tickets for them
2012-11-14 14:59:51 +01:00
mark_story
12e2e1363d
Skip more tests when openssl is not enabled.
...
5.2 environments on travis-ci don't have openssl enabled.
2012-11-11 22:53:13 -05:00
mark_story
240c8718eb
Implement SSL peer verification in HttpSocket
...
Use the stream API and enable SSL certificate validation. This
increases the security features of HttpSocket, and provides easy access
to the stream context options. SSL related configuration should be
prefixed with 'ssl_'.
Refs #2270
2012-11-11 14:23:17 -05:00
mark_story
b9ee4fc9f1
URL decode redirect urls.
...
Some servers send url encoded Location headers. Decode location headers
before processing a redirect.
Fixes #3310
2012-10-29 22:29:13 -04:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01: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
mark_story
21ba5bf04a
Merge branch '2.1' into 2.2
2012-04-17 21:47:24 -04:00
mark_story
45e3414d49
Add test for query string encoding.
...
Closes #2768
2012-04-10 20:08:12 -04:00
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
Kyle Robinson Young
90e7afbdc7
Correct parameter order of assertEquals and assertNotEquals
2012-03-22 23:37:12 -07:00
mark_story
d0733ceb00
Fix most coding standards in Case/Network
2012-03-16 22:19:01 -04:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
mark_story
150c9fc6a3
Remove parse_str() its buggy and wrong.
...
parse_str() replaces `.` with _ and drops duplicated keys, which is
incorrect. Replace parse_str with an updated version of parseQuery
from 1.x
Fixes #2629
Fixes #2647
2012-03-08 21:05:28 -05:00
Kyle Robinson Young
4176e59e52
Typo fixes in tests
2012-02-23 15:29:53 -08: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
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
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
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08: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
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
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
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
Juan Basso
fcd96bcc60
Using native methods to query in HttpSocket.
2011-10-29 15:40:41 -04:00
Majna
8c3f64be52
Fixing doc blocks in Test suite and some visibility keywords.
2011-10-10 23:18:48 +02: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
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
Juan Basso
192812ee7f
Updating the copyright to 2011.
2011-05-30 22:32:43 -04:00
Renan Gonçalves
438050dcaa
Adding 'public' visibility to all public methods.
2011-05-30 22:02:32 +02:00
Jose Lorenzo Rodriguez
900dfef2f7
Starting unification of casing in remaining folders
2011-05-13 01:53:49 -04:30
