Skip to content

Commit 5225a11

Browse files
tattalitattali
committed
Fix tests
1 parent 3219235 commit 5225a11

File tree

4 files changed

+62
-62
lines changed

4 files changed

+62
-62
lines changed

‎tests/DataCollector/DeviceDataCollectorTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use MobileDetectBundle\Helper\DeviceView;
1919
use PHPUnit\Framework\MockObject\MockObject;
2020
use PHPUnit\Framework\TestCase;
21-
use Symfony\Component\HttpFoundation\ParameterBag;
21+
use Symfony\Component\HttpFoundation\InputBag;
2222
use Symfony\Component\HttpFoundation\Request;
2323
use Symfony\Component\HttpFoundation\RequestStack;
2424
use Symfony\Component\HttpFoundation\Response;
@@ -53,8 +53,8 @@ protected function setUp(): void
5353
parent::setUp();
5454

5555
$this->request = $this->getMockBuilder(Request::class)->getMock();
56-
$this->request->query = new ParameterBag();
57-
$this->request->cookies = new ParameterBag();
56+
$this->request->query = new InputBag();
57+
$this->request->cookies = new InputBag();
5858
$this->request->server = new ServerBag();
5959
$this->request->expects(self::any())->method('duplicate')->willReturn($this->request);
6060

@@ -75,7 +75,7 @@ public function testCollectCurrentViewMobileIsCurrent(): void
7575
'status_code' => Response::HTTP_FOUND,
7676
'action' => RequestResponseListener::REDIRECT,
7777
];
78-
$this->request->cookies = new ParameterBag([DeviceView::COOKIE_KEY_DEFAULT => DeviceView::VIEW_MOBILE]);
78+
$this->request->cookies = new InputBag([DeviceView::COOKIE_KEY_DEFAULT => DeviceView::VIEW_MOBILE]);
7979
$deviceView = new DeviceView($this->requestStack);
8080
$deviceDataCollector = new DeviceDataCollector($deviceView);
8181
$deviceDataCollector->setRedirectConfig($redirectConfig);
@@ -109,7 +109,7 @@ public function testCollectCurrentViewMobileCanUseTablet(): void
109109
'status_code' => Response::HTTP_FOUND,
110110
'action' => RequestResponseListener::REDIRECT,
111111
];
112-
$this->request->query = new ParameterBag(['param1' => 'value1']);
112+
$this->request->query = new InputBag(['param1' => 'value1']);
113113
$this->request->expects(self::any())->method('getSchemeAndHttpHost')->willReturn('http://t.testsite.com');
114114
$this->request->expects(self::any())->method('getBaseUrl')->willReturn('/base-url');
115115
$this->request->expects(self::any())->method('getPathInfo')->willReturn('/path-info');
@@ -126,7 +126,7 @@ public function testCollectCurrentViewMobileCanUseTablet(): void
126126

127127
return $test->request->getSchemeAndHttpHost().$test->request->getBaseUrl().$test->request->getPathInfo().$qs;
128128
});
129-
$this->request->cookies = new ParameterBag([DeviceView::COOKIE_KEY_DEFAULT => DeviceView::VIEW_MOBILE]);
129+
$this->request->cookies = new InputBag([DeviceView::COOKIE_KEY_DEFAULT => DeviceView::VIEW_MOBILE]);
130130
$deviceView = new DeviceView($this->requestStack);
131131
$deviceDataCollector = new DeviceDataCollector($deviceView);
132132
$deviceDataCollector->setRedirectConfig($redirectConfig);
@@ -172,7 +172,7 @@ public function testCollectCurrentViewFullCanUseMobile(): void
172172
'status_code' => Response::HTTP_FOUND,
173173
'action' => RequestResponseListener::REDIRECT,
174174
];
175-
$this->request->query = new ParameterBag(['param1' => 'value1']);
175+
$this->request->query = new InputBag(['param1' => 'value1']);
176176
$this->request->expects(self::any())->method('getSchemeAndHttpHost')->willReturn('http://t.testsite.com');
177177
$this->request->expects(self::any())->method('getBaseUrl')->willReturn('/base-url');
178178
$this->request->expects(self::any())->method('getPathInfo')->willReturn('/path-info');
@@ -189,7 +189,7 @@ public function testCollectCurrentViewFullCanUseMobile(): void
189189

190190
return $test->request->getSchemeAndHttpHost().$test->request->getBaseUrl().$test->request->getPathInfo().$qs;
191191
});
192-
$this->request->cookies = new ParameterBag([DeviceView::COOKIE_KEY_DEFAULT => DeviceView::VIEW_FULL]);
192+
$this->request->cookies = new InputBag([DeviceView::COOKIE_KEY_DEFAULT => DeviceView::VIEW_FULL]);
193193
$deviceView = new DeviceView($this->requestStack);
194194
$deviceDataCollector = new DeviceDataCollector($deviceView);
195195
$deviceDataCollector->setRedirectConfig($redirectConfig);
@@ -235,7 +235,7 @@ public function testCollectCurrentViewFullCantUseMobile(): void
235235
'status_code' => Response::HTTP_FOUND,
236236
'action' => RequestResponseListener::REDIRECT,
237237
];
238-
$this->request->query = new ParameterBag(['param1' => 'value1']);
238+
$this->request->query = new InputBag(['param1' => 'value1']);
239239
$this->request->expects(self::any())->method('getSchemeAndHttpHost')->willReturn('http://testsite.com');
240240
$this->request->expects(self::any())->method('getBaseUrl')->willReturn('/base-url');
241241
$this->request->expects(self::any())->method('getPathInfo')->willReturn('/path-info');
@@ -252,7 +252,7 @@ public function testCollectCurrentViewFullCantUseMobile(): void
252252

253253
return $test->request->getSchemeAndHttpHost().$test->request->getBaseUrl().$test->request->getPathInfo().$qs;
254254
});
255-
$this->request->cookies = new ParameterBag([DeviceView::COOKIE_KEY_DEFAULT => DeviceView::VIEW_FULL]);
255+
$this->request->cookies = new InputBag([DeviceView::COOKIE_KEY_DEFAULT => DeviceView::VIEW_FULL]);
256256
$deviceView = new DeviceView($this->requestStack);
257257
$deviceDataCollector = new DeviceDataCollector($deviceView);
258258
$deviceDataCollector->setRedirectConfig($redirectConfig);

‎tests/EventListener/RequestResponseListenerTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use PHPUnit\Framework\TestCase;
1313
use Symfony\Component\HttpFoundation\Cookie;
1414
use Symfony\Component\HttpFoundation\HeaderBag;
15-
use Symfony\Component\HttpFoundation\ParameterBag;
15+
use Symfony\Component\HttpFoundation\InputBag;
1616
use Symfony\Component\HttpFoundation\Request;
1717
use Symfony\Component\HttpFoundation\RequestStack;
1818
use Symfony\Component\HttpFoundation\Response;
@@ -71,8 +71,8 @@ protected function setUp(): void
7171
$this->request->expects(self::any())->method('getSchemeAndHttpHost')->willReturn('http://testhost.com');
7272
$this->request->expects(self::any())->method('get')->willReturn('value');
7373
$this->request->expects(self::any())->method('getUriForPath')->willReturn('/');
74-
$this->request->query = new ParameterBag();
75-
$this->request->cookies = new ParameterBag();
74+
$this->request->query = new InputBag();
75+
$this->request->cookies = new InputBag();
7676

7777
$this->requestStack = $this->getMockBuilder(RequestStack::class)->disableOriginalConstructor()->getMock();
7878
$this->requestStack->expects(self::any())
@@ -89,7 +89,7 @@ protected function setUp(): void
8989

9090
public function testHandleRequestHasSwitchParam(): void
9191
{
92-
$this->request->query = new ParameterBag(['myparam' => 'myvalue', $this->switchParam => DeviceView::VIEW_MOBILE]);
92+
$this->request->query = new InputBag(['myparam' => 'myvalue', $this->switchParam => DeviceView::VIEW_MOBILE]);
9393
$this->request->expects(self::any())->method('getPathInfo')->willReturn('/');
9494
$deviceView = new DeviceView($this->requestStack);
9595
$deviceView->setRedirectConfig([DeviceView::VIEW_MOBILE => ['status_code' => Response::HTTP_FOUND]]);
@@ -114,7 +114,7 @@ public function testHandleRequestHasSwitchParam(): void
114114

115115
public function testHandleRequestBis(): void
116116
{
117-
$this->request->query = new ParameterBag(['myparam' => 'myvalue', $this->switchParam => DeviceView::VIEW_MOBILE]);
117+
$this->request->query = new InputBag(['myparam' => 'myvalue', $this->switchParam => DeviceView::VIEW_MOBILE]);
118118
$this->request->expects(self::any())->method('getPathInfo')->willReturn('/');
119119
$deviceView = new DeviceView($this->requestStack);
120120
$deviceView->setRedirectConfig([DeviceView::VIEW_MOBILE => ['status_code' => Response::HTTP_FOUND]]);
@@ -141,7 +141,7 @@ public function testHandleRequestHasSwitchParamAndQuery(): void
141141
{
142142
$this->config['mobile'] = ['is_enabled' => true, 'host' => 'http://mobilehost.com'];
143143

144-
$this->request->query = new ParameterBag(['myparam' => 'myvalue', $this->switchParam => DeviceView::VIEW_MOBILE]);
144+
$this->request->query = new InputBag(['myparam' => 'myvalue', $this->switchParam => DeviceView::VIEW_MOBILE]);
145145
$this->request->expects(self::any())->method('getPathInfo')->willReturn('/');
146146
$this->request->expects(self::any())->method('get')->willReturn('value');
147147
$this->router->expects(self::exactly(2))->method('getRouteCollection')->willReturn(
@@ -241,7 +241,7 @@ public function testHandleRequestHasTabletRedirect(): void
241241
{
242242
$this->config['tablet'] = ['is_enabled' => true, 'host' => 'http://t.testsite.com', 'status_code' => Response::HTTP_FOUND];
243243

244-
$this->request->query = new ParameterBag(['some' => 'param']);
244+
$this->request->query = new InputBag(['some' => 'param']);
245245
$this->request->expects(self::any())->method('getPathInfo')->willReturn('/some/parameters');
246246
$this->request->expects(self::any())->method('get')->willReturn('value');
247247
$this->router->expects(self::exactly(2))->method('getRouteCollection')->willReturn(
@@ -284,7 +284,7 @@ public function testHandleRequestWithDifferentSwitchParamRedirect(): void
284284

285285
$switchParam = 'custom_param';
286286

287-
$this->request->query = new ParameterBag(['some' => 'param']);
287+
$this->request->query = new InputBag(['some' => 'param']);
288288
$this->request->expects(self::any())->method('getPathInfo')->willReturn('/some/parameters');
289289
$this->router->expects(self::exactly(2))->method('getRouteCollection')->willReturn(
290290
$this->createRouteCollectionWithRouteAndRoutingOption(RequestResponseListener::REDIRECT, 2)

0 commit comments

Comments
 (0)