Commit graph

158 commits

Author SHA1 Message Date
Jose Lorenzo Rodriguez
df549898ad Merge remote-tracking branch 'origin/2.5' into k-halaburda-master 2013-10-12 01:05:02 +02:00
Bryan Crowe
c1dd0e4393 Changed url to URL where appropriate 2013-10-07 23:17:58 -04:00
mark_story
60b0893c79 Merge branch 'master' into 2.5 2013-10-06 23:49:32 -03:00
Renan Gonçalves
4f3b3737a5 Fixing CS errors. 2013-10-03 14:09:24 +02:00
mark_story
530731ec5d More gracefully handle invalid data in Accept headers.
Some browsers have invalid accept headers, we should ignore the invalid
extension data as assuming it will be a qualifier can result in
incorrect results.

Fixes #4105
2013-10-02 11:29:04 -04:00
mark_story
d2577fac60 Merge branch 'master' into 2.5 2013-09-21 20:01:50 -04:00
euromark
17bd465cae simplify tests 2013-09-19 00:17:21 +02:00
mark_story
a7a6fcae8a Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2013-09-17 10:11:24 -04:00
euromark
382f75dbfc cs corrections, bool to boolean and int to integer. 2013-09-17 14:44:34 +02:00
spiliot
37c9832dc1 removed duplicate test case
Was exact duplicate of case starting line 692
2013-09-17 00:48:09 +03:00
Calin
075bf37030 Added test case for param with options detector.
Fix coding standards errors.
2013-08-27 09:38:46 -04:00
ADmad
61bf8df454 Renaming base url config keys and methods for better uniformity. 2013-08-01 00:44:36 +05:30
ADmad
4ded269549 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
	lib/Cake/VERSION.txt
2013-07-07 12:22:12 +05:30
euromark
ba02678693 doc block corrections 2013-07-05 16:17:23 +02:00
mark_story
c597855fe4 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Test/Case/Network/CakeRequestTest.php
2013-07-03 14:21:09 -04:00
mark_story
521c293eb1 Fix coding standards. 2013-07-01 22:56:00 -04:00
Marc Würth
f930a50805 Fix for #3318
Fixes https://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/3318

It seems fixing this in the htaccess file(s) isn't going to work even though a url rewriting based solution was more clean. On the plus side this works for any web server.
If a url is called with "index.php" in it then the CakeRequest swallows this part and fixes the path. Any linked url from the requested page will have a clean url. Thus after following one of these urls this problem is gone anyway.

Some code docblock improvements to CakeRequestTest.php
Added test case for fix
Also now you can call just index.php even if you have url rewriting enabled
2013-06-30 05:38:58 +02:00
mark_story
f09693f6e8 Merge branch 'master' into 2.4 2013-06-29 23:26:26 -04:00
mark_story
0d76bfe325 Add an additional test for CakeRequest::referer().
Trying to track down the issue for #3897. This test coverage was
missing, so fix that.
2013-06-29 23:26:13 -04:00
José Lorenzo Rodríguez
3b4a4fde31 Merge pull request #1317 from lorenzo/feature/full-base-url
Adding App.fullbaseURL as a recognized Configure value
2013-06-05 15:12:27 -07:00
ADmad
3303a2cda1 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
	lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
	lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
	lib/Cake/Console/Templates/skel/Config/acl.ini.php
	lib/Cake/Console/Templates/skel/Config/acl.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/database.php.default
	lib/Cake/Console/Templates/skel/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
	lib/Cake/Console/Templates/skel/Console/cake.bat
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/Controller/AppController.php
	lib/Cake/Console/Templates/skel/Controller/PagesController.php
	lib/Cake/Console/Templates/skel/Model/AppModel.php
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Jose Lorenzo Rodriguez
4bc92b822e Adding App.fullbaseURL as a recognized Configure value 2013-05-30 16:07:26 +02:00
mark_story
df872dde28 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/VERSION.txt
2013-05-10 21:58:48 -04:00
mark_story
6017db9dc8 Add missing urlencoding to base/webroot.
This fixes URL generation when PHP_SELF or the request path contains
special characters.
2013-05-10 11:04:46 -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
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
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
mark_story
773666ddad Fix coding standards and save a function call. 2013-01-17 20:34:25 -05: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
Ceeram
eadc3a75e5 fix coding standards 2012-11-21 15:39:03 +01: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
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
mark_story
1aea9ac0c9 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Event/CakeEventManager.php
	lib/Cake/VERSION.txt
	lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
mark_story
59f84024e5 Handle REQUEST_URI with domain names properly.
Don't depend on parse_url() as it fails with corrupted urls.  Instead
use FULL_BASE_URL to prepare an absolute path.

Fixes #3270
2012-10-14 11:58:07 -04:00
mark_story
1110e26483 Fix 0'th index file not being copied to $_FILES.
Fixes #3256
2012-10-11 08:39:46 -04:00
mark_story
57681ff115 Fix code style errors. 2012-10-09 13:20:53 -04:00
dogmatic69
408e619c9f Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
euromark
60385d1d28 test the query() method with arrays passed via $_GET 2012-09-19 03:14:55 +02:00
euromark
e8cfac0eec adding query() for CakeRequest 2012-09-18 19:38:53 +02:00
dogmatic69
5cc03ca805 converting if($foo == true) to if($foo) 2012-09-14 18:54:29 +01:00
Juan Basso
fd2f3aed46 Changed to accept language do not return the qualifiers and order the values by the qualifier. Also, making the test case insensitive 2012-08-28 23:52:05 -04:00
ceeram
973670ca1c Merge pull request #749 from ceeram/2.3-allow
Add allowed() to CakeRequest, to check if the request method matches the...
2012-08-22 16:44:11 -07:00
Ceeram
d730acba59 Add onlyAllow() to CakeRequest, to check if the request method matches the allowed ones.
Throws exception if not matched, using the required Allow response header.
2012-08-22 17:23:24 +02:00
mark_story
e75fdd21ee Add tests to show caseinsensitive nature of detectors.
Closes #3132
2012-08-20 11:43:10 -04:00
mark_story
e183e91b17 Make CakeRequest work with content-type headers that include a charset.
Refs #3113
2012-08-14 12:42:05 -04:00
Rodrigo Moyle
e10f6f57a3 Fix notice error when parsing input data.
Prevent error in CakeRequest from parsing input data in
PUT and DELETE requests.

Fixes #3002

Signed-off-by: mark_story <mark@mark-story.com>
2012-07-05 22:06:02 -04:00
mark_story
54679023f9 Add support for DELETE + form encoded data.
Much like PUT, DELETE requests will automatically parse
form-urlencoded request bodies and set them as $this->data.
2012-06-17 20:03:45 -04:00
AD7six
2335ef1a13 remove pseudo-mock code
Not required, not used by any committed code
2012-06-06 23:08:40 +02:00
AD7six
b509bdb04b Automatically handle PUT requests
make the following "just work"

    curl -X PUT -d foo=bar http://...
2012-06-06 22:59:37 +02:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
mark_story
f6b33db02c Add test for accept header.
Refs #2828
2012-04-29 14:48:45 -04:00
mark_story
c15259f49c Remove useless backups.
PHPUnit does this for us.
Fix formatting and whitespace.
2012-04-17 21:57:07 -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
17eb0e4f68 Fix duplicate values when merging POST data.
Fixes #2648
2012-03-06 20:22:13 -05:00
dogmatic69
ac06880241 making the name lowercase in the addDetector method so that it will be found in the is() method fixes #2622 with tests. 2012-02-28 16:05:32 +00:00
Mark Story
1ddc8f6489 Merge pull request #519 from shama/patch-vis-convention
Correct convention with public visibility
2012-02-23 09:23:13 -08:00
Kyle Robinson Young
c202859523 Correct convention with public visibility 2012-02-23 00:03:31 -08:00
Kyle Robinson Young
86fafd0ae5 Fix failing tests with CakeRequest when ran in webrunner 2012-02-22 23:50:13 -08:00
Ceeram
2e2ee3b096 another attempy to set correc order for expected and result in assert, definitely time for some coffee 2012-02-22 22:31:28 +01:00
Ceeram
d5cdc46661 fixed expected and result order in asserts, also added extra test 2012-02-22 22:25:24 +01:00
Ceeram
44ea3fb122 testcase for incorrect merge of post data 2012-02-22 21:53:51 +01:00
mark_story
6684b775cd Fix failing tests. 2012-02-21 20:45:44 -05:00
Kyle Robinson Young
45ec5d73c5 Add missing visibility keywords 2012-02-16 23:13:12 -08:00
mark_story
943d928084 Merge branch '2.0' into 2.1 2012-02-18 22:19:38 -05:00
mark_story
89df484fc5 Remove un-necessary Set::merge().
Using Set::merge() on an empty array causes issues with out of order
numeric keys. Only merge if necessary.

Fixes #2595
2012-02-18 22:18:16 -05:00
mark_story
20229eeb43 Merge branch '2.0' into 2.1 2012-02-18 11:22:18 -05:00
mark_story
fce70df6ff Fix failing tests.
rawurlencode() and urlencode() handle utf8 differently.
2012-02-18 11:18:03 -05:00
mark_story
2f51ef00ed Add failing tests for patches from 'teddyzeenny'. 2012-02-18 10:53:47 -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
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
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
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
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
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
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04: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
mark_story
50a0a51f53 Renaming method to better match what it does. 2011-09-24 21:56:37 -04: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
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
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