Fix init and global cleanup

This commit is contained in:
Dennis Eichhorn 2017-07-09 10:10:09 +02:00
parent 9e49ff6802
commit ff4a6864c3

View File

@ -77,7 +77,7 @@ class Request extends RequestAbstract
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function __construct(Localization $l11n, UriInterface $uri = null) public function __construct(Localization $l11n = null, UriInterface $uri = null)
{ {
$this->l11n = $l11n; $this->l11n = $l11n;
$this->uri = $uri; $this->uri = $uri;
@ -104,12 +104,10 @@ class Request extends RequestAbstract
if (!isset($this->uri)) { if (!isset($this->uri)) {
$this->initCurrentRequest(); $this->initCurrentRequest();
$this->lock(); $this->lock();
$this->cleanupGlobals();
} }
$this->data = array_change_key_case($this->data, CASE_LOWER); $this->data = array_change_key_case($this->data, CASE_LOWER);
$this->cleanupGlobals();
$this->path = explode('/', $this->uri->getPath()); $this->path = explode('/', $this->uri->getPath());
$this->setupUriBuilder(); $this->setupUriBuilder();