Development

- Ensure that request-method is always lowercase.
- Fixed spaces instead of tabs to comply with PSR-2.

src/Pecee/Controllers/IRestController.php

@@ -1,7 +1,8 @@
 <?php
 namespace Pecee\Controllers;
 
-interface IRestController {
+interface IRestController
+{
 
     /**
      * @return void

src/Pecee/CsrfToken.php

@@ -17,6 +17,7 @@ class CsrfToken
         if (function_exists('mcrypt_create_iv')) {
             return bin2hex(mcrypt_create_iv(32, MCRYPT_DEV_URANDOM));
         }
+
         return bin2hex(openssl_random_pseudo_bytes(32));
     }
 
@@ -31,6 +32,7 @@ class CsrfToken
         if ($token !== null && $this->getToken() !== null) {
             return hash_equals($token, $this->getToken());
         }
+
         return false;
     }
 
@@ -53,6 +55,7 @@ class CsrfToken
         if ($this->hasToken()) {
             return $_COOKIE[static::CSRF_KEY];
         }
+
         return null;
     }
 

src/Pecee/Http/Input/Input.php

@@ -25,40 +25,13 @@ class Input
      */
     protected $request;
 
-	protected $invalidContentType = false;
-
-	protected $invalidContentTypes = [
-		'text/plain',
-		'application/x-www-form-urlencoded',
-	];
-
     public function __construct(Request $request)
     {
         $this->request = $request;
 
-		if ($request->getMethod() !== 'get') {
-
-			$requestContentType = $request->getHeader('http-content-type');
-
-			$max = count($this->invalidContentTypes) - 1;
-
-			for ($i = $max; $i >= 0; $i--) {
-
-				$contentType = $this->invalidContentType[$i];
-
-				if (stripos($requestContentType, $contentType) === 0) {
-					$this->invalidContentType = true;
-					break;
-				}
-			}
-		}
-
-		if ($this->invalidContentType === false) {
         $this->parseInputs();
     }
 
-	}
-
     protected function parseInputs()
     {
         /* Parse get requests */

src/Pecee/Http/Input/InputItem.php

@@ -48,6 +48,7 @@ class InputItem implements IInputItem
     public function setName($name)
     {
         $this->name = $name;
+
         return $this;
     }
 
@@ -59,6 +60,7 @@ class InputItem implements IInputItem
     public function setValue($value)
     {
         $this->value = $value;
+
         return $this;
     }
 

src/Pecee/Http/Middleware/BaseCsrfVerifier.php

@@ -79,6 +79,7 @@ class BaseCsrfVerifier implements IMiddleware
     {
         $token = $this->csrfToken->generateToken();
         $this->csrfToken->setToken($token);
+
         return $token;
     }
 

src/Pecee/Http/Request.php

@@ -18,7 +18,7 @@ class Request
         $this->host = $this->getHeader('http-host');;
         $this->uri = $this->getHeader('request-uri');
         $this->input = new Input($this);
-		$this->method = $this->input->get('_method', strtolower($this->getHeader('request-method')));
+        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method')));
     }
 
     protected function parseHeaders()

src/Pecee/Http/Response.php

@@ -19,6 +19,7 @@ class Response
     public function httpCode($code)
     {
         http_response_code($code);
+
         return $this;
     }
 
@@ -52,8 +53,9 @@ class Response
     {
         $this->headers([
             'WWW-Authenticate: Basic realm="' . $name . '"',
-			'HTTP/1.0 401 Unauthorized'
+            'HTTP/1.0 401 Unauthorized',
         ]);
+
         return $this;
     }
 
@@ -63,7 +65,7 @@ class Response
         $this->headers([
             'Cache-Control: public',
             'Last-Modified: ' . gmdate("D, d M Y H:i:s", $lastModified) . ' GMT',
-			'Etag: ' . $eTag
+            'Etag: ' . $eTag,
         ]);
 
         $httpModified = $this->request->getHeader('http-if-modified-since');
@@ -98,6 +100,7 @@ class Response
     public function header($value)
     {
         header($value);
+
         return $this;
     }
 
@@ -112,6 +115,7 @@ class Response
         for ($i = 0; $i < $max; $i++) {
             $this->header($headers[$i]);
         }
+
         return $this;
     }
 

src/Pecee/SimpleRouter/Router.php

@@ -422,6 +422,7 @@ class Router
         /* Return current route if no options has been specified */
         if ($name === null && $parameters === null) {
             $url = rtrim(parse_url($this->request->getUri(), PHP_URL_PATH), '/');
+
             return (($url === '') ? '/' : $url . '/') . $this->arrayToParams($getParams);
         }
 
@@ -465,6 +466,7 @@ class Router
 
         /* No result so we assume that someone is using a hardcoded url and join everything together. */
         $url = trim(join('/', array_merge((array)$name, (array)$parameters)), '/');
+
         return (($url === '') ? '/' : '/' . $url . '/') . $this->arrayToParams($getParams);
     }