Merge pull request #21 from InteractionDesignFoundation/update-dependencies

Update dependencies, remove Lumen support

Author: alies-dev

.github/workflows/run-tests.yml

@@ -8,12 +8,9 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.1, 8.0]
-        laravel: [^10.0, ^9.0]
+        php: [8.3, 8.2, 8.1]
+        laravel: [^10.0]
         dependencies: [lowest, highest]
-        exclude:
-          - php: 8.0
-            laravel: ^10.0
 
     name: P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }}
 

.github/workflows/static-analysis.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           coverage: none
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -11,10 +11,10 @@ Determine the geographical location and currency of website visitors based on th
 
 ## About this fork
 
-We have forked [Torann/laravel-geoip](https://github.com/Torann/laravel-geoip) as it’s almost not maintained anymore.
-This fork works with modern PHP versions only (8.0+).
+We have forked [Torann/laravel-geoip](https://github.com/Torann/laravel-geoip) as it’s almost not actively maintained anymore.
+This fork works with modern PHP versions only (8.1+).
 Also, as for any InteractionDesignFoundation project, we are going to improving code quality by using types, static analysers, tests and linters.
-But don’t worry, we are using SemVer 2.0.
+But don’t worry, we are following SemVer 2.0.
 
 
 ## Installation
@@ -121,7 +121,7 @@ Please see [CONTRIBUTING](.github/CONTRIBUTING.md) for details.
 
 ## Contributions
 
-Many people have contributed to project since its inception.
+Many people have contributed to the project since its inception.
 
 Thanks to:
 

composer.json

@@ -12,18 +12,18 @@
     "infoDB"
   ],
   "require": {
-    "php": "^8.0",
-    "illuminate/cache": "^9.0 || ^10.0",
-    "illuminate/console": "^9.0 || ^10.0",
-    "illuminate/support": "^9.0 || ^10.0"
+    "php": "^8.1",
+    "illuminate/cache": "^10.0 || ^11.0",
+    "illuminate/console": "^10.0 || ^11.0",
+    "illuminate/support": "^10.0 || ^11.0"
   },
   "require-dev": {
     "geoip2/geoip2": "^2.11",
-    "mockery/mockery": "^1.4",
-    "phpstan/phpstan": "^1.2",
-    "phpunit/phpunit": "^9.6 || ^10.0",
-    "squizlabs/php_codesniffer": "^3.6",
-    "vimeo/psalm": "^5.7",
+    "mockery/mockery": "^1.6",
+    "phpstan/phpstan": "^1.10",
+    "phpunit/phpunit": "^10.5 || ^11.0",
+    "squizlabs/php_codesniffer": "^3.9",
+    "vimeo/psalm": "^5.22",
     "vlucas/phpdotenv": "^5.4"
   },
   "suggest": {

config/geoip.php

@@ -131,7 +131,7 @@
     | Cache Expiration
     |--------------------------------------------------------------------------
     |
-    | Define how long cached location are valid.
+    | Cache's time to live in seconds.
     |
     */
 

docs/services.md

@@ -4,9 +4,9 @@
 
 ⚠️ Before using MaxMind driver, you must install the `geoip2/geoip2` package using the Composer package manager.
 
-The database location to used is specified in the config file in the "services" section under maxmind_database.
+The database location to use is specified in the config file in the "services" section under maxmind_database.
 Along with the URL of where to download the database from when running the php artisan geoip:update.
-Note: The `geoip:update` command will need to be ran before the package will work.
+Note: The `geoip:update` command will need to be run before the package will work.
 
 ```php
 'service' => 'maxmind_database',

phpunit.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          backupGlobals="false"
          bootstrap="vendor/autoload.php"
          colors="true"
          processIsolation="false"
          stopOnFailure="false">
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </coverage>
     <testsuites>
         <testsuite name="GeoIP Package Test Suite">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </source>
 </phpunit>