default to GET request when no method is set to fix unittests, also set parsed json...

diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index 43631697d3a633de45098248cf6f2078299c7e27..643fa685adcd72e7735fc4eaad30ab5ccdb8831a 100644 (file)
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -65,6 +65,10 @@ class Request implements \ArrayAccess, \Countable, IRequest {
                $this->inputStream = $stream;
                $this->items['params'] = array();
 
+               if(!array_key_exists('method', $vars)) {
+                       $vars['method'] = 'GET';                        
+               }
+
                foreach($this->allowedKeys as $name) {
                        $this->items[$name] = isset($vars[$name])
                                ? $vars[$name] 
@@ -76,6 +80,9 @@ class Request implements \ArrayAccess, \Countable, IRequest {
                        $params = json_decode(file_get_contents($this->inputStream), true);
                        if(count($params) > 0) {
                                $this->items['params'] = $params;
+                               if($vars['method'] === 'POST') {
+                                       $this->items['post'] = $params;                                 
+                               }
                        }
                // Handle application/x-www-form-urlencoded for methods other than GET
                // or post correctly

diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
index f3ebff0207f38a9fda87495debed6ba3cba444de..d1bc900fb28bfa82a55cc97d810f8a0f20c1806d 100644 (file)
--- a/tests/lib/appframework/dependencyinjection/DIContainerTest.php
+++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
@@ -70,7 +70,7 @@ class DIContainerTest extends \PHPUnit_Framework_TestCase {
 
 
        public function testMiddlewareDispatcherIncludesSecurityMiddleware(){
-               $this->container['Request'] = new Request();
+               $this->container['Request'] = new Request(array('method' => 'GET'));
                $security = $this->container['SecurityMiddleware'];
                $dispatcher = $this->container['MiddlewareDispatcher'];
 

diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php
index 00473a8c44f9167827592591d6df7e6847cd8216..58828d17bb2ab7c00d6dd7f738b89d59216bc619 100644 (file)
--- a/tests/lib/appframework/http/RequestTest.php
+++ b/tests/lib/appframework/http/RequestTest.php
@@ -18,6 +18,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
                        stream_wrapper_unregister('fakeinput');
                }
                stream_wrapper_register('fakeinput', 'RequestStream');
+               $this->stream = 'fakeinput://data';
        }
 
        public function tearDown() {
@@ -30,7 +31,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
                        'method' => 'GET',
                );
 
-               $request = new Request($vars);
+               $request = new Request($vars, $this->stream);
 
                // Countable
                $this->assertEquals(2, count($request));
@@ -54,9 +55,10 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
                        'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
                        'post' => array('name' => 'Jane Doe', 'nickname' => 'Janey'),
                        'urlParams' => array('user' => 'jw', 'name' => 'Johnny Weissmüller'),
+                       'method' => 'GET'
                );
 
-               $request = new Request($vars);
+               $request = new Request($vars, $this->stream);
 
                $this->assertEquals(3, count($request));
                $this->assertEquals('Janey', $request->{'nickname'});
@@ -70,9 +72,10 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
        public function testImmutableArrayAccess() {
                $vars = array(
                        'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
+                       'method' => 'GET'
                );
 
-               $request = new Request($vars);
+               $request = new Request($vars, $this->stream);
                $request['nickname'] = 'Janey';
        }
 
@@ -82,9 +85,10 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
        public function testImmutableMagicAccess() {
                $vars = array(
                        'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
+                       'method' => 'GET'
                );
 
-               $request = new Request($vars);
+               $request = new Request($vars, $this->stream);
                $request->{'nickname'} = 'Janey';
        }
 
@@ -97,7 +101,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
                        'method' => 'GET',
                );
 
-               $request = new Request($vars);
+               $request = new Request($vars, $this->stream);
                $result = $request->post;
        }
 
@@ -107,7 +111,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
                        'method' => 'GET',
                );
 
-               $request = new Request($vars);
+               $request = new Request($vars, $this->stream);
                $this->assertEquals('GET', $request->method);
                $result = $request->get;
                $this->assertEquals('John Q. Public', $result['name']);
@@ -119,10 +123,10 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
                $data = '{"name": "John Q. Public", "nickname": "Joey"}';
                $vars = array(
                        'method' => 'POST',
-                       'server' => array('CONTENT_TYPE' => 'application/json; utf-8'),
+                       'server' => array('CONTENT_TYPE' => 'application/json; utf-8')
                );
 
-               $request = new Request($vars);
+               $request = new Request($vars, $this->stream);
                $this->assertEquals('POST', $request->method);
                $result = $request->post;
                $this->assertEquals('John Q. Public', $result['name']);
@@ -140,7 +144,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
                        'server' => array('CONTENT_TYPE' => 'application/x-www-form-urlencoded'),
                );
 
-               $request = new Request($vars);
+               $request = new Request($vars, $this->stream);
 
                $this->assertEquals('PATCH', $request->method);
                $result = $request->patch;
@@ -159,7 +163,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
                        'server' => array('CONTENT_TYPE' => 'application/json; utf-8'),
                );
 
-               $request = new Request($vars);
+               $request = new Request($vars, $this->stream);
 
                $this->assertEquals('PUT', $request->method);
                $result = $request->put;
@@ -174,7 +178,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
                        'server' => array('CONTENT_TYPE' => 'application/json; utf-8'),
                );
 
-               $request = new Request($vars);
+               $request = new Request($vars, $this->stream);
 
                $this->assertEquals('PATCH', $request->method);
                $result = $request->patch;
@@ -193,7 +197,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
                        'server' => array('CONTENT_TYPE' => 'image/png'),
                );
 
-               $request = new Request($vars);
+               $request = new Request($vars, $this->stream);
                $this->assertEquals('PUT', $request->method);
                $resource = $request->put;
                $contents = stream_get_contents($resource);

diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
index f16b14150c34a9a18c45255918feba42bbe4e20e..935f97d2a6f251630d6d813b0298bd35189b54e3 100644 (file)
--- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
@@ -132,7 +132,7 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
 
        private function getControllerMock(){
                return $this->getMock('OCP\AppFramework\Controller', array('method'),
-                       array($this->getAPIMock(), new Request()));
+                       array($this->getAPIMock(), new Request(array('method' => 'GET'))));
        }