Skip to content

Commit 21d7f8b

Browse files
authored
Merge pull request tattali#13 from tattali/tattali-patch-1
Fix fails tests
2 parents 68729d9 + c807731 commit 21d7f8b

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ jobs:
6161
ini-values: zend.assertions=1
6262

6363
- name: Globally install symfony/flex
64-
run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
64+
run: |
65+
composer global config --no-plugins allow-plugins.symfony/flex true
66+
composer global require --no-progress --no-scripts --no-plugins symfony/flex
6567
6668
- name: Configure minimum stability of dependencies
6769
run: composer config minimum-stability ${{ matrix.stability }}

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
"config": {
5757
"sort-packages": true,
5858
"allow-plugins": {
59-
"phpstan/extension-installer": true
59+
"phpstan/extension-installer": true,
60+
"symfony/flex": true
6061
}
6162
},
6263
"autoload": {

src/EventListener/RequestResponseListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ protected function getRoutingOption(string $routeName, string $optionName): ?str
224224

225225
protected function getRedirectUrl(Request $request, string $view): ?string
226226
{
227-
if (($routingOption = $this->getRoutingOption($request->get('_route'), $view))) {
227+
if ($routingOption = $this->getRoutingOption($request->get('_route'), $view)) {
228228
if (self::REDIRECT === $routingOption) {
229229
// Make sure to hint at the device override, otherwise infinite loop
230230
// redirection may occur if different device views are hosted on
@@ -254,7 +254,7 @@ protected function getRedirectUrl(Request $request, string $view): ?string
254254
*/
255255
protected function getRedirectResponse(Request $request, string $view): ?RedirectResponse
256256
{
257-
if (($host = $this->getRedirectUrl($request, $view))) {
257+
if ($host = $this->getRedirectUrl($request, $view)) {
258258
return $this->deviceView->getRedirectResponse(
259259
$view,
260260
$host,

0 commit comments

Comments
 (0)