Skip to content

Commit

Permalink
see cl 1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Kunitzsch committed Mar 22, 2018
1 parent 914928d commit deb991d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Changelog
All notable changes to this project will be documented in this file.

## [1.0.2] - 2018-03-22

### Fixed
- fixed call of `parent::__construct` with empty properties

## [1.0.1] - 2018-03-12

### Fixed
- removed `heimrichhannot/contao-utils-bundle` circular dependency
- removed `heimrichhannot/contao-utils-bundle` circular dependency
5 changes: 2 additions & 3 deletions src/Component/HttpFoundation/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,10 @@ public function __construct(ContaoFrameworkInterface $framework, RequestStack $r
$this->framework = $framework;
$this->scopeMatcher = $scopeMatcher;

$request = $requestStack->getCurrentRequest();
parent::__construct($request->query->all(), $request->request->all(), $request->attributes->all(), $request->cookies->all(), $request->files->all(), $request->server->all(), $request->getContent());
parent::__construct($request->query ? $request->query->all() : [], $request->request ? $request->request->all() : [], $request->attributes ? $request->attributes->all() : [], $request->cookies ? $request->cookies->all() : [], $request->files ? $request->files->all() : [], $request->server ? $request->server->all() : [], $request ? $request->getContent() : null);

// As long as contao adds unused parameters to $_GET and $_POST Globals inside \Contao\Input, we have to add them inside custom ParameterBag classes
$this->query = new QueryParameterBag($request->query->all());
$this->query = new QueryParameterBag($request->query ? $request->query->all() : []);
}

/**
Expand Down

0 comments on commit deb991d

Please sign in to comment.