Skip to content

Commit ceb2f2e

Browse files
authored
Merge pull request #69 from ipinfo/silvano/eng-301-ticket-no-259804-ipinfo-laravel-package-support-for-laravel
Properly add support for Laravel 12
2 parents 20e4f19 + d4de650 commit ceb2f2e

3 files changed

Lines changed: 14 additions & 9 deletions

File tree

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
php: ["8.1", "8.2", "8.3", "8.4"]
16+
php: ["8.3", "8.4"]
1717

1818
steps:
1919
- name: Checkout

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
1313
"homepage": "https://github.com/ipinfo/ipinfolaravel",
1414
"keywords": ["Laravel", "ipinfolaravel"],
1515
"require": {
16-
"illuminate/support": "^7.0|^8.0|^9.0|^10.0|^11.0",
16+
"illuminate/support": "^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
1717
"ipinfo/ipinfo": "^3.2.0"
1818
},
1919
"require-dev": {
20-
"phpunit/phpunit": "^9.6",
20+
"phpunit/phpunit": "^12.0",
2121
"mockery/mockery": "^1.4.2",
22-
"orchestra/testbench": "^8.36",
23-
"sempro/phpunit-pretty-print": "^1.3.0",
22+
"orchestra/testbench": "^10.6",
2423
"squizlabs/php_codesniffer": "^3.5.8"
2524
},
2625
"autoload": {

phpunit.xml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
3-
<coverage>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
bootstrap="vendor/autoload.php"
4+
colors="true"
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.0/phpunit.xsd">
6+
7+
<source>
48
<include>
5-
<directory suffix=".php">src/</directory>
9+
<directory suffix=".php">src</directory>
610
</include>
7-
</coverage>
11+
</source>
12+
813
<testsuites>
914
<testsuite name="ipinfo-laravel Test Suite">
1015
<directory>tests</directory>
1116
</testsuite>
1217
</testsuites>
18+
1319
<logging>
1420
<junit outputFile="build/report.junit.xml"/>
1521
</logging>

0 commit comments

Comments
 (0)