Purge session from Request - and fix some styles

diff --git a/lib/appframework/http/request.php b/lib/appframework/http/request.php
index 4f1775182a1e89da5b23d5656a7644d1dbdc3357..34605acdfead8b7073f19702fd6965799e1b776c 100644 (file)
--- a/lib/appframework/http/request.php
+++ b/lib/appframework/http/request.php
@@ -33,16 +33,15 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 
        protected $items = array();
        protected $allowedKeys = array(
-               'get', 
-               'post', 
-               'files', 
-               'server', 
-               'env', 
-               'session', 
-               'cookies', 
-               'urlParams', 
-               'params', 
-               'parameters', 
+               'get',
+               'post',
+               'files',
+               'server',
+               'env',
+               'cookies',
+               'urlParams',
+               'params',
+               'parameters',
                'method'
        );
 
@@ -156,7 +155,6 @@ class Request implements \ArrayAccess, \Countable, IRequest {
                        case 'files':
                        case 'server':
                        case 'env':
-                       case 'session':
                        case 'cookies':
                        case 'parameters':
                        case 'params':
@@ -229,8 +227,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
         * @param mixed $default If the key is not found, this value will be returned
         * @return mixed the content of the array
         */
-       public function getParam($key, $default = null)
-       {
+       public function getParam($key, $default = null) {
                return isset($this->parameters[$key])
                        ? $this->parameters[$key]
                        : $default;
@@ -241,8 +238,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
         * (as GET or POST) or throuh the URL by the route
         * @return array the array with all parameters
         */
-       public function getParams()
-       {
+       public function getParams() {
                return $this->parameters;
        }
 
@@ -250,8 +246,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
         * Returns the method of the request
         * @return string the method of the request (POST, GET, etc)
         */
-       public function getMethod()
-       {
+       public function getMethod() {
                return $this->method;
        }
 
@@ -260,8 +255,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
         * @param string $key the key that will be taken from the $_FILES array
         * @return array the file in the $_FILES element
         */
-       public function getUploadedFile($key)
-       {
+       public function getUploadedFile($key) {
                return isset($this->files[$key]) ? $this->files[$key] : null;
        }
 
@@ -270,28 +264,16 @@ class Request implements \ArrayAccess, \Countable, IRequest {
         * @param string $key the key that will be taken from the $_ENV array
         * @return array the value in the $_ENV element
         */
-       public function getEnv($key)
-       {
+       public function getEnv($key) {
                return isset($this->env[$key]) ? $this->env[$key] : null;
        }
 
-       /**
-        * Shortcut for getting session variables
-        * @param string $key the key that will be taken from the $_SESSION array
-        * @return array the value in the $_SESSION element
-        */
-       function getSession($key)
-       {
-               return isset($this->session[$key]) ? $this->session[$key] : null;
-       }
-
        /**
         * Shortcut for getting cookie variables
         * @param string $key the key that will be taken from the $_COOKIE array
         * @return array the value in the $_COOKIE element
         */
-       function getCookie($key)
-       {
+       function getCookie($key) {
                return isset($this->cookies[$key]) ? $this->cookies[$key] : null;
        }
 
@@ -304,8 +286,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
         *
         * @throws \LogicException
         */
-       function getContent($asResource = false)
-       {
+       function getContent($asResource = false) {
                return null;
 //             if (false === $this->content || (true === $asResource && null !== $this->content)) {
 //                     throw new \LogicException('getContent() can only be called once when using the resource return type.');

diff --git a/lib/public/irequest.php b/lib/public/irequest.php
index cd39855950bc875324dbb8e5e8dbf782829c016c..9f335b06f2ac85093f6ff92f6749d8dbd48d2129 100644 (file)
--- a/lib/public/irequest.php
+++ b/lib/public/irequest.php
@@ -76,15 +76,6 @@ interface IRequest {
        public function getEnv($key);
 
 
-       /**
-        * Shortcut for getting session variables
-        *
-        * @param string $key the key that will be taken from the $_SESSION array
-        * @return array the value in the $_SESSION element
-        */
-       function getSession($key);
-
-
        /**
         * Shortcut for getting cookie variables
         *

diff --git a/lib/server.php b/lib/server.php
index 0124ad72c02928a42b9af122036895bd4ebc3352..0eee3e0f73a808ca061aef7150dd4cb622ebe4b5 100644 (file)
--- a/lib/server.php
+++ b/lib/server.php
@@ -36,7 +36,6 @@ class Server extends SimpleContainer implements IServerContainer {
                                        'files' => $_FILES,
                                        'server' => $_SERVER,
                                        'env' => $_ENV,
-                                       'session' => $_SESSION,
                                        'cookies' => $_COOKIE,
                                        'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
                                                ? $_SERVER['REQUEST_METHOD']