ADmad
06a5c509c0
Merge branch 'master' into 2.4
2013-04-21 19:15:55 +05:30
mark_story
4d8dd12449
Add support for key => value cookies.
...
This makes using simple arrays easier, and I feel it is a long standing
omission from HttpSocket.
Fixes #3771
2013-04-18 21:22:50 -04:00
mark_story
ce04d6afa1
Add CakeRequest::isAll().
...
Provides a way to test multiple request types at the same time. And
assert that all pass. This replaces longer conditionals with a terser
syntax.
Refs #3714
2013-04-01 21:52:22 -04:00
mark_story
d4a3594e4f
Add support for is() with multiple types.
...
Add ability to check if a request is one of a set number of types
by providing an array. If any type matches, then the method returns
true.
Refs #3714
2013-04-01 21:52:15 -04:00
mark_story
3fc627c5f8
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Error/ErrorHandler.php
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
lib/Cake/View/Helper/HtmlHelper.php
2013-03-30 22:12:27 -04:00
ADmad
7b90542230
Fix CS error
2013-03-31 00:23:03 +05:30
Joel Bradshaw
ece6ac3663
Backwards compat for auth in the config array of HttpSocket::request()
...
Brings functionality back in line with docs as well
2013-03-29 15:46:42 -07:00
Jad Bitar
f1b815a9bb
Add scope to email logging.
2013-03-01 22:24:02 -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
mark_story
9f25da49ef
Attempt to get more tests passing on travis ci.
2013-02-19 22:17:47 -05:00
mark_story
27dc666c8d
Fix incorrect method names.
2013-02-19 22:04:44 -05:00
mark_story
3e34a09e8b
Make skips more permissive.
...
Hopefully this fixes issues on travisci.
2013-02-19 21:05:05 -05:00
mark_story
341c0d17f0
Attempt to fix failures in travisci.
...
Network tests have recently started failing, make those skip conditions
instead. Convert SocketExceptions in Xml::build() into XmlExceptions.
This is the documented behavior so we should try to honour that.
2013-02-19 20:53:28 -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
mark_story
103bbbc375
Add CakeRequest::param()
...
This method gives a read accessor to the data in $request->params.
It removes the need to use isset() and empty().
2013-02-03 22:09:52 -05:00
mark_story
4af6039107
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
Ceeram
16be9d4990
remove unused local vars
2013-01-23 17:22:06 +01:00
mark_story
773666ddad
Fix coding standards and save a function call.
2013-01-17 20:34:25 -05:00
Mark Story
acc6a2645f
Merge pull request #1039 from bfanger/master
...
Fixes an issue with urls as GET parameters
2013-01-17 17:31:59 -08: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
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01:00
Bob Fanger
13dc397172
Added unittest for REQUEST_URI with multiple FQDNs.
2012-12-21 19:59:55 +01:00
Bob Fanger
b7b6859c27
Fixes corrupted CakeRequests when a $_GET value contains "://"
2012-12-21 16:12:51 +01:00
euromark
910e21e65e
a few more application contents should send the charset
...
adding content type tests as dataprovider
2012-12-21 12:32:32 +01:00
mark_story
554d5794ce
Merge branch 'master' into 2.3
2012-12-19 21:18:52 -05:00
mark_story
7ad11f59bb
Change line length in emails.
...
Use LINE_LENGTH_MUST instead of LINE_LENGTH_SHOULD. This
fixes a number of text wrapping issues caused by the narrower wrap
length.
Fixes #3151
Fixes #3473
2012-12-17 20:54:38 -05:00
euromark
881127ef4d
unify new lines at the end of the file
2012-12-05 15:00:24 +01:00
Jose Lorenzo Rodriguez
c1551d9828
Merge branch 'master' into 2.3
2012-12-02 00:34:55 +01:00
Jose Lorenzo Rodriguez
da4fdbac3a
Fixing failing test case
2012-12-02 00:34:26 +01: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
04d4abfa53
Merge pull request #965 from frederikweber/patch-1
...
Send charset in Content-Type when Content is JSON.
2012-11-19 17:08:57 -08:00
frederikweber
58df515a6d
Add test for Content-Type JSON and charset.
2012-11-18 23:44:37 +01: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
593cfc05d5
Skip tests if openssl is not enabled.
2012-11-11 22:28:23 -05:00
mark_story
d95ef5d5e8
Fix failing tests.
2012-11-11 21:57:52 -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
9e725641ad
Add context() to CakeSocket.
...
This will help enable peer verification for HttpSocket later on.
2012-11-10 22:58:36 -05:00
Ceeram
aaf2d2ef71
fix remaining cs errors
2012-11-04 13:56:13 +01:00
mark_story
60f9626838
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-02 16:52:51 -04:00
mark_story
8035b37df2
Only set $request->data with PUT/DELETE when it can be decoded.
...
Setting $request->data to the raw put data isn't overly useful unless it
can be decoded. Generally $request->data is expected to be an array,
when its a string things can go funny.
Fixes #3320
2012-10-31 21:02:47 -04: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
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