Skip to content

Commit 0603685

Browse files
committed
Support Laravel 7
1 parent 036b35f commit 0603685

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

Diff for: composer.json

+11-7
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,25 @@
1212
{
1313
"name": "Jimmy Puckett",
1414
"email": "[email protected]"
15+
},
16+
{
17+
"name": "Stephen Finney",
18+
"email": "[email protected]"
1519
}
1620
],
1721
"require": {
1822
"php": ">=7.2",
19-
"illuminate/cache": "~5.5|~6",
20-
"illuminate/routing": "~5.5|~6",
21-
"illuminate/support": "~5.5|~6",
23+
"illuminate/cache": "~5.5|~6|~7",
24+
"illuminate/routing": "~5.5|~6|~7",
25+
"illuminate/support": "~5.5|~6|~7",
2226
"mobiledetect/mobiledetectlib": "~2.8",
2327
"ua-parser/uap-php": "~3.9"
2428
},
2529
"require-dev": {
26-
"illuminate/http": "~5.5|~6",
27-
"mockery/mockery": "^1",
28-
"phpunit/phpunit": "~7.0.1|~8.0",
29-
"psy/psysh": "^0.9.9",
30+
"illuminate/http": "~5.5|~6|~7",
31+
"mockery/mockery": "^1.3.1",
32+
"phpunit/phpunit": "^8.4|^9.0",
33+
"psy/psysh": "^0.10",
3034
"symfony/thanks": "^1.1",
3135
"symfony/var-dumper": "~3.0|^4.2"
3236
},

Diff for: phpunit.xml.dist

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
convertErrorsToExceptions="true"
1515
convertNoticesToExceptions="true"
1616
convertWarningsToExceptions="true"
17-
processIsolation="true"
17+
processIsolation="false"
1818
stopOnFailure="false"
1919
verbose="true">
2020

@@ -48,7 +48,6 @@
4848
showOnlySummary="true"
4949
showUncoveredFiles="false"/>
5050
<log type="coverage-clover" target="build/phpunit/logs/clover.xml"/>
51-
<log type="json" target="./build/phpunit/logs/logfile.json"/>
5251
<log type="junit" target="./build/phpunit/logs/junit.xml"/>
5352
</logging>
5453
</phpunit>

Diff for: src/Filter.php

+2
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ public function handle(Request $request, Closure $next, $filter_string = null, $
252252
public function haveRulesForDevice()
253253
{
254254
return array_key_exists($this->client->device->family, $this->getRules());
255+
256+
//$this->client->device->family
255257
}
256258

257259
/**

0 commit comments

Comments
 (0)