Skip to content

Commit

Permalink
Merge pull request #13 from tattali/tattali-patch-1
Browse files Browse the repository at this point in the history
Fix fails tests
  • Loading branch information
tattali authored Jul 23, 2022
2 parents 68729d9 + c807731 commit 21d7f8b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ jobs:
ini-values: zend.assertions=1

- name: Globally install symfony/flex
run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins symfony/flex
- name: Configure minimum stability of dependencies
run: composer config minimum-stability ${{ matrix.stability }}
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
"config": {
"sort-packages": true,
"allow-plugins": {
"phpstan/extension-installer": true
"phpstan/extension-installer": true,
"symfony/flex": true
}
},
"autoload": {
Expand Down
4 changes: 2 additions & 2 deletions src/EventListener/RequestResponseListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ protected function getRoutingOption(string $routeName, string $optionName): ?str

protected function getRedirectUrl(Request $request, string $view): ?string
{
if (($routingOption = $this->getRoutingOption($request->get('_route'), $view))) {
if ($routingOption = $this->getRoutingOption($request->get('_route'), $view)) {
if (self::REDIRECT === $routingOption) {
// Make sure to hint at the device override, otherwise infinite loop
// redirection may occur if different device views are hosted on
Expand Down Expand Up @@ -254,7 +254,7 @@ protected function getRedirectUrl(Request $request, string $view): ?string
*/
protected function getRedirectResponse(Request $request, string $view): ?RedirectResponse
{
if (($host = $this->getRedirectUrl($request, $view))) {
if ($host = $this->getRedirectUrl($request, $view)) {
return $this->deviceView->getRedirectResponse(
$view,
$host,
Expand Down

0 comments on commit 21d7f8b

Please sign in to comment.