Skip to content

Commit cfd6b54

Browse files
tattalitattali
committed
Deprecate 5.1
1 parent ef95c43 commit cfd6b54

File tree

9 files changed

+384
-381
lines changed

9 files changed

+384
-381
lines changed

‎.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ jobs:
3838
- 6.*
3939
include:
4040
# Tests the lowest set of dependencies
41-
- symfony-require: 5.1.*
41+
- symfony-require: 5.4.*
4242
dependencies: lowest
4343
stability: stable
44-
php: 7.2
44+
php: 8.0
4545

4646
# Bleeding edge
4747
- symfony-require: 6.*

‎src/DeviceDetector/MobileDetectorInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,6 @@ public function isTablet();
395395
* This method will be used to check custom regexes against
396396
* the User-Agent string.
397397
*
398-
* @param $regex
399398
* @param string $userAgent
400399
*
401400
* @return bool

‎src/Helper/DeviceView.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ class DeviceView
105105

106106
public function __construct(RequestStack $requestStack = null)
107107
{
108-
$methodName = method_exists(RequestStack::class, 'getMainRequest') ? 'getMainRequest' : 'getMasterRequest';
109-
if (!$requestStack || !$this->request = $requestStack->{$methodName}()) {
108+
if (!$requestStack || !$this->request = $requestStack->getMainRequest()) {
110109
$this->viewType = self::VIEW_NOT_MOBILE;
111110

112111
return;

‎src/Twig/Extension/MobileDetectExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class MobileDetectExtension extends AbstractExtension
4848

4949
public function __construct(RequestStack $requestStack, MobileDetectorInterface $mobileDetector, DeviceView $deviceView, array $redirectConf)
5050
{
51-
$this->request = method_exists(RequestStack::class, 'getMainRequest') ? $requestStack->getMainRequest() : $requestStack->getMasterRequest();
51+
$this->request = $requestStack->getMainRequest();
5252
$this->mobileDetector = $mobileDetector;
5353
$this->deviceView = $deviceView;
5454
$this->redirectConf = $redirectConf;

‎tests/DataCollector/DeviceDataCollectorTest.php

Lines changed: 70 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
* @author suncat2000 <nikolay.kotovsky@gmail.com>
2929
*
3030
* @internal
31+
*
3132
* @coversDefaultClass
3233
*/
3334
final class DeviceDataCollectorTest extends TestCase
@@ -55,11 +56,11 @@ protected function setUp(): void
5556
$this->request->query = new ParameterBag();
5657
$this->request->cookies = new ParameterBag();
5758
$this->request->server = new ServerBag();
58-
$this->request->expects(static::any())->method('duplicate')->willReturn($this->request);
59+
$this->request->expects(self::any())->method('duplicate')->willReturn($this->request);
5960

6061
$this->requestStack = $this->getMockBuilder(RequestStack::class)->disableOriginalConstructor()->getMock();
61-
$this->requestStack->expects(static::any())
62-
->method(method_exists(RequestStack::class, 'getMainRequest') ? 'getMainRequest' : 'getMasterRequest')
62+
$this->requestStack->expects(self::any())
63+
->method('getMainRequest')
6364
->willReturn($this->request)
6465
;
6566

@@ -83,19 +84,19 @@ public function testCollectCurrentViewMobileIsCurrent(): void
8384
$currentView = $deviceDataCollector->getCurrentView();
8485
$views = $deviceDataCollector->getViews();
8586

86-
static::assertSame($deviceView->getViewType(), $currentView);
87-
static::assertSame(DeviceView::VIEW_MOBILE, $currentView);
88-
static::assertCount(3, $views);
87+
self::assertSame($deviceView->getViewType(), $currentView);
88+
self::assertSame(DeviceView::VIEW_MOBILE, $currentView);
89+
self::assertCount(3, $views);
8990

9091
foreach ($views as $view) {
91-
static::assertIsArray($view);
92-
static::assertArrayHasKey('type', $view);
93-
static::assertArrayHasKey('label', $view);
94-
static::assertArrayHasKey('link', $view);
95-
static::assertArrayHasKey('isCurrent', $view);
96-
static::assertArrayHasKey('enabled', $view);
92+
self::assertIsArray($view);
93+
self::assertArrayHasKey('type', $view);
94+
self::assertArrayHasKey('label', $view);
95+
self::assertArrayHasKey('link', $view);
96+
self::assertArrayHasKey('isCurrent', $view);
97+
self::assertArrayHasKey('enabled', $view);
9798
if (DeviceView::VIEW_MOBILE === $view['type']) {
98-
static::assertTrue($view['isCurrent']);
99+
self::assertTrue($view['isCurrent']);
99100
}
100101
}
101102
}
@@ -109,16 +110,16 @@ public function testCollectCurrentViewMobileCanUseTablet(): void
109110
'action' => RequestResponseListener::REDIRECT,
110111
];
111112
$this->request->query = new ParameterBag(['param1' => 'value1']);
112-
$this->request->expects(static::any())->method('getSchemeAndHttpHost')->willReturn('http://t.testsite.com');
113-
$this->request->expects(static::any())->method('getBaseUrl')->willReturn('/base-url');
114-
$this->request->expects(static::any())->method('getPathInfo')->willReturn('/path-info');
113+
$this->request->expects(self::any())->method('getSchemeAndHttpHost')->willReturn('http://t.testsite.com');
114+
$this->request->expects(self::any())->method('getBaseUrl')->willReturn('/base-url');
115+
$this->request->expects(self::any())->method('getPathInfo')->willReturn('/path-info');
115116
$test = $this;
116-
$this->request->expects(static::any())->method('getQueryString')->willReturnCallback(function () use ($test) {
117+
$this->request->expects(self::any())->method('getQueryString')->willReturnCallback(function () use ($test) {
117118
$qs = Request::normalizeQueryString($test->request->server->get('QUERY_STRING'));
118119

119120
return '' === $qs ? null : $qs;
120121
});
121-
$this->request->expects(static::any())->method('getUri')->willReturnCallback(function () use ($test) {
122+
$this->request->expects(self::any())->method('getUri')->willReturnCallback(function () use ($test) {
122123
if (null !== $qs = $test->request->getQueryString()) {
123124
$qs = '?'.$qs;
124125
}
@@ -134,24 +135,24 @@ public function testCollectCurrentViewMobileCanUseTablet(): void
134135
$currentView = $deviceDataCollector->getCurrentView();
135136
$views = $deviceDataCollector->getViews();
136137

137-
static::assertSame($deviceView->getViewType(), $currentView);
138-
static::assertSame(DeviceView::VIEW_MOBILE, $currentView);
139-
static::assertCount(3, $views);
138+
self::assertSame($deviceView->getViewType(), $currentView);
139+
self::assertSame(DeviceView::VIEW_MOBILE, $currentView);
140+
self::assertCount(3, $views);
140141

141142
foreach ($views as $view) {
142-
static::assertIsArray($view);
143-
static::assertArrayHasKey('type', $view);
144-
static::assertArrayHasKey('label', $view);
145-
static::assertArrayHasKey('link', $view);
146-
static::assertArrayHasKey('isCurrent', $view);
147-
static::assertArrayHasKey('enabled', $view);
143+
self::assertIsArray($view);
144+
self::assertArrayHasKey('type', $view);
145+
self::assertArrayHasKey('label', $view);
146+
self::assertArrayHasKey('link', $view);
147+
self::assertArrayHasKey('isCurrent', $view);
148+
self::assertArrayHasKey('enabled', $view);
148149
if (DeviceView::VIEW_MOBILE === $view['type']) {
149-
static::assertTrue($view['isCurrent']);
150+
self::assertTrue($view['isCurrent']);
150151
}
151152
if (DeviceView::VIEW_TABLET === $view['type']) {
152-
static::assertFalse($view['isCurrent']);
153-
static::assertTrue($view['enabled']);
154-
static::assertSame(
153+
self::assertFalse($view['isCurrent']);
154+
self::assertTrue($view['enabled']);
155+
self::assertSame(
155156
sprintf(
156157
'http://t.testsite.com/base-url/path-info?%s=%s&param1=value1',
157158
$deviceView->getSwitchParam(),
@@ -172,16 +173,16 @@ public function testCollectCurrentViewFullCanUseMobile(): void
172173
'action' => RequestResponseListener::REDIRECT,
173174
];
174175
$this->request->query = new ParameterBag(['param1' => 'value1']);
175-
$this->request->expects(static::any())->method('getSchemeAndHttpHost')->willReturn('http://t.testsite.com');
176-
$this->request->expects(static::any())->method('getBaseUrl')->willReturn('/base-url');
177-
$this->request->expects(static::any())->method('getPathInfo')->willReturn('/path-info');
176+
$this->request->expects(self::any())->method('getSchemeAndHttpHost')->willReturn('http://t.testsite.com');
177+
$this->request->expects(self::any())->method('getBaseUrl')->willReturn('/base-url');
178+
$this->request->expects(self::any())->method('getPathInfo')->willReturn('/path-info');
178179
$test = $this;
179-
$this->request->expects(static::any())->method('getQueryString')->willReturnCallback(function () use ($test) {
180+
$this->request->expects(self::any())->method('getQueryString')->willReturnCallback(function () use ($test) {
180181
$qs = Request::normalizeQueryString($test->request->server->get('QUERY_STRING'));
181182

182183
return '' === $qs ? null : $qs;
183184
});
184-
$this->request->expects(static::any())->method('getUri')->willReturnCallback(function () use ($test) {
185+
$this->request->expects(self::any())->method('getUri')->willReturnCallback(function () use ($test) {
185186
if (null !== $qs = $test->request->getQueryString()) {
186187
$qs = '?'.$qs;
187188
}
@@ -197,24 +198,24 @@ public function testCollectCurrentViewFullCanUseMobile(): void
197198
$currentView = $deviceDataCollector->getCurrentView();
198199
$views = $deviceDataCollector->getViews();
199200

200-
static::assertSame($deviceView->getViewType(), $currentView);
201-
static::assertSame(DeviceView::VIEW_FULL, $currentView);
202-
static::assertCount(3, $views);
201+
self::assertSame($deviceView->getViewType(), $currentView);
202+
self::assertSame(DeviceView::VIEW_FULL, $currentView);
203+
self::assertCount(3, $views);
203204

204205
foreach ($views as $view) {
205-
static::assertIsArray($view);
206-
static::assertArrayHasKey('type', $view);
207-
static::assertArrayHasKey('label', $view);
208-
static::assertArrayHasKey('link', $view);
209-
static::assertArrayHasKey('isCurrent', $view);
210-
static::assertArrayHasKey('enabled', $view);
206+
self::assertIsArray($view);
207+
self::assertArrayHasKey('type', $view);
208+
self::assertArrayHasKey('label', $view);
209+
self::assertArrayHasKey('link', $view);
210+
self::assertArrayHasKey('isCurrent', $view);
211+
self::assertArrayHasKey('enabled', $view);
211212
if (DeviceView::VIEW_FULL === $view['type']) {
212-
static::assertTrue($view['isCurrent']);
213+
self::assertTrue($view['isCurrent']);
213214
}
214215
if (DeviceView::VIEW_MOBILE === $view['type']) {
215-
static::assertFalse($view['isCurrent']);
216-
static::assertTrue($view['enabled']);
217-
static::assertSame(
216+
self::assertFalse($view['isCurrent']);
217+
self::assertTrue($view['enabled']);
218+
self::assertSame(
218219
sprintf(
219220
'http://t.testsite.com/base-url/path-info?%s=%s&param1=value1',
220221
$deviceView->getSwitchParam(),
@@ -235,16 +236,16 @@ public function testCollectCurrentViewFullCantUseMobile(): void
235236
'action' => RequestResponseListener::REDIRECT,
236237
];
237238
$this->request->query = new ParameterBag(['param1' => 'value1']);
238-
$this->request->expects(static::any())->method('getSchemeAndHttpHost')->willReturn('http://testsite.com');
239-
$this->request->expects(static::any())->method('getBaseUrl')->willReturn('/base-url');
240-
$this->request->expects(static::any())->method('getPathInfo')->willReturn('/path-info');
239+
$this->request->expects(self::any())->method('getSchemeAndHttpHost')->willReturn('http://testsite.com');
240+
$this->request->expects(self::any())->method('getBaseUrl')->willReturn('/base-url');
241+
$this->request->expects(self::any())->method('getPathInfo')->willReturn('/path-info');
241242
$test = $this;
242-
$this->request->expects(static::any())->method('getQueryString')->willReturnCallback(function () use ($test) {
243+
$this->request->expects(self::any())->method('getQueryString')->willReturnCallback(function () use ($test) {
243244
$qs = Request::normalizeQueryString($test->request->server->get('QUERY_STRING'));
244245

245246
return '' === $qs ? null : $qs;
246247
});
247-
$this->request->expects(static::any())->method('getUri')->willReturnCallback(function () use ($test) {
248+
$this->request->expects(self::any())->method('getUri')->willReturnCallback(function () use ($test) {
248249
if (null !== $qs = $test->request->getQueryString()) {
249250
$qs = '?'.$qs;
250251
}
@@ -260,24 +261,24 @@ public function testCollectCurrentViewFullCantUseMobile(): void
260261
$currentView = $deviceDataCollector->getCurrentView();
261262
$views = $deviceDataCollector->getViews();
262263

263-
static::assertSame($deviceView->getViewType(), $currentView);
264-
static::assertSame(DeviceView::VIEW_FULL, $currentView);
265-
static::assertCount(3, $views);
264+
self::assertSame($deviceView->getViewType(), $currentView);
265+
self::assertSame(DeviceView::VIEW_FULL, $currentView);
266+
self::assertCount(3, $views);
266267

267268
foreach ($views as $view) {
268-
static::assertIsArray($view);
269-
static::assertArrayHasKey('type', $view);
270-
static::assertArrayHasKey('label', $view);
271-
static::assertArrayHasKey('link', $view);
272-
static::assertArrayHasKey('isCurrent', $view);
273-
static::assertArrayHasKey('enabled', $view);
269+
self::assertIsArray($view);
270+
self::assertArrayHasKey('type', $view);
271+
self::assertArrayHasKey('label', $view);
272+
self::assertArrayHasKey('link', $view);
273+
self::assertArrayHasKey('isCurrent', $view);
274+
self::assertArrayHasKey('enabled', $view);
274275
if (DeviceView::VIEW_FULL === $view['type']) {
275-
static::assertTrue($view['isCurrent']);
276+
self::assertTrue($view['isCurrent']);
276277
}
277278
if (DeviceView::VIEW_MOBILE === $view['type']) {
278-
static::assertFalse($view['isCurrent']);
279-
static::assertFalse($view['enabled']);
280-
static::assertSame(
279+
self::assertFalse($view['isCurrent']);
280+
self::assertFalse($view['enabled']);
281+
self::assertSame(
281282
sprintf(
282283
'http://testsite.com/base-url/path-info?%s=%s&param1=value1',
283284
$deviceView->getSwitchParam(),
@@ -294,13 +295,13 @@ public function testReset(): void
294295
$deviceView = new DeviceView($this->requestStack);
295296
$deviceDataCollector = new DeviceDataCollector($deviceView);
296297
$deviceDataCollector->reset();
297-
static::assertSame([], $deviceDataCollector->getData());
298+
self::assertSame([], $deviceDataCollector->getData());
298299
}
299300

300301
public function testGetNameValue(): void
301302
{
302303
$deviceView = new DeviceView($this->requestStack);
303304
$deviceDataCollector = new DeviceDataCollector($deviceView);
304-
static::assertSame('device.collector', $deviceDataCollector->getName());
305+
self::assertSame('device.collector', $deviceDataCollector->getName());
305306
}
306307
}

0 commit comments

Comments
 (0)