Add support for php8.4 and other improvements

.gitattributes

@@ -1,9 +1,10 @@
 * text=auto eol=lf
 
-/tests         export-ignore
-.editorconfig  export-ignore
-.gitattributes export-ignore
-.gitignore     export-ignore
-.travis.yml    export-ignore
-phpunit.xml    export-ignore
-phpcs.xml      export-ignore
+/tests               export-ignore
+.editorconfig        export-ignore
+.gitattributes       export-ignore
+.gitignore           export-ignore
+.php-cs-fixer.php    export-ignore
+phpcs.xml.dist       export-ignore
+phpunit.xml.dist     export-ignore
+.phpstan.neon        export-ignore

.github/workflows/main.yaml

@@ -1,10 +1,10 @@
 name: "testing"
 
 on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    push:
+        branches: [ master ]
+    pull_request:
+        branches: [ master ]
 
 jobs:
     qa:
@@ -13,19 +13,19 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Validate composer.json and composer.lock
               run: composer validate
 
             - name: Cache Composer packages
               id: composer-cache
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
-                path: vendor
-                key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-                restore-keys: |
-                  ${{ runner.os }}-php-
+                  path: vendor
+                  key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-php-
 
             - name: Install dependencies
               if: steps.composer-cache.outputs.cache-hit != 'true'
@@ -40,37 +40,34 @@ jobs:
 
         strategy:
             matrix:
-              php:
-                - 7.2
-                - 7.3
-                - 7.4
-              composer-args: [ "" ]
-              include:
-                - php: 8.0
-                  composer-args: --ignore-platform-reqs
-            fail-fast: false
+                php:
+                    - 7.2
+                    - 7.3
+                    - 7.4
+                    - 8.0
+                    - 8.1
+                    - 8.2
+                    - 8.3
+                    - 8.4
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Install PHP
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
 
             - name: Cache PHP dependencies
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
                   path: vendor
                   key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
                   restore-keys: ${{ runner.os }}-php-${{ matrix.php }}-composer-
 
             - name: Install dependencies
-              run: composer install --prefer-dist --no-progress ${{ matrix.composer-args }}
+              run: composer install --prefer-dist --no-progress
 
             - name: Tests
               run: composer test
-
-            - name: Tests coverage
-              run: composer coverage

.gitignore

@@ -3,3 +3,6 @@ composer.lock
 .php_cs.cache
 coverage
 .phpunit.result.cache
+.idea
+kit
+*.cache

.php-cs-fixer.php

@@ -0,0 +1,11 @@
+<?php
+
+
+return My\PhpCsFixerConfig::create()
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->files()
+            ->name('*.php')
+            ->in(__DIR__.'/src')
+            ->in(__DIR__.'/tests')
+    );

.phpstan.neon

@@ -0,0 +1,8 @@
+parameters:
+    #treatPhpDocTypesAsCertain: false
+    reportUnmatchedIgnoredErrors: false
+    inferPrivatePropertyTypeFromConstructor: true
+    level: 8
+    paths:
+        - src
+        - tests

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.1.0] - 2025-03-21
+### Added
+- Support for PHP 8.4
+
 ## [3.0.0] - 2020-12-04
 ### Added
 - Support for PHP 8
@@ -60,6 +64,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## 0.1.0 - 2016-10-10
 First version
 
+[3.1.0]: https://github.com/middlewares/geolocation/compare/v3.0.0...v3.1.0
 [3.0.0]: https://github.com/middlewares/geolocation/compare/v2.0.0...v3.0.0
 [2.0.0]: https://github.com/middlewares/geolocation/compare/v1.0.0...v2.0.0
 [1.0.0]: https://github.com/middlewares/geolocation/compare/v0.5.0...v1.0.0

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018
+Copyright (c) 2018-2025
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -19,20 +19,20 @@
     },
     "require": {
         "php": "^7.2 || ^8.0",
-        "willdurand/geocoder": "^4.0",
-        "php-http/message": "^1.6",
-        "psr/http-server-middleware": "^1.0"
+        "willdurand/geocoder": "^4",
+        "php-http/message": "^1",
+        "psr/http-server-middleware": "^1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8|^9",
-        "friendsofphp/php-cs-fixer": "^2.0",
-        "squizlabs/php_codesniffer": "^3.0",
-        "middlewares/utils": "^2.1",
-        "eloquent/phony-phpunit": "^6.0|^7.0",
-        "php-http/guzzle6-adapter": "^1.1",
-        "geocoder-php/free-geoip-provider": "^4.1",
-        "phpstan/phpstan": "^0.12",
-        "laminas/laminas-diactoros": "^2.3"
+        "phpunit/phpunit": "^8 || ^9",
+        "friendsofphp/php-cs-fixer": "^3",
+        "squizlabs/php_codesniffer": "^3",
+        "middlewares/utils": "^2 || ^3 || ^4",
+        "php-http/guzzle7-adapter": "^1",
+        "geocoder-php/free-geoip-provider": "^4",
+        "phpstan/phpstan": "^1 || ^2",
+        "laminas/laminas-diactoros": "^2 || ^3",
+        "oscarotero/php-cs-fixer-config": "^2"
     },
     "autoload": {
         "psr-4": {
@@ -51,5 +51,10 @@
         "test": "phpunit",
         "coverage": "phpunit --coverage-text",
         "coverage-html": "phpunit --coverage-html=coverage"
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": false
+        }
     }
 }

phpcs.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<ruleset name="Middlewares coding standard">
+    <description>Middlewares coding standard</description>
+
+    <!-- display progress -->
+    <arg value="p"/>
+    <arg name="report" value="full"/>
+    <arg name="colors"/>
+
+    <!-- coding standard -->
+    <rule ref="PSR2"/>
+
+    <!-- Paths to check -->
+    <file>src</file>
+    <file>tests</file>
+</ruleset>

phpunit.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         colors="true"
+         verbose="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         failOnWarning="true">
+    <testsuites>
+        <testsuite name="Geolocation test suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
+            <directory>./src</directory>
+            <exclude>
+                <directory>./tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>

tests/GeolocationTest.php

@@ -3,29 +3,36 @@
 
 namespace Middlewares\Tests;
 
-use Eloquent\Phony\Phpunit\Phony;
+use Geocoder\Collection;
 use Geocoder\Model\Address;
 use Geocoder\Model\AddressCollection;
 use Geocoder\Provider\FreeGeoIp\FreeGeoIp;
-use Http\Adapter\Guzzle6\Client;
+use Http\Adapter\Guzzle7\Client;
 use Middlewares\Geolocation;
 use Middlewares\Utils\Dispatcher;
 use Middlewares\Utils\Factory;
 use PHPUnit\Framework\TestCase;
 
 class GeolocationTest extends TestCase
 {
+    /**
+     * @return Geolocation
+     */
     private static function getMiddleware()
     {
-        $container = Phony::partialMock(Geolocation::class, [new FreeGeoIp(new Client())]);
-        $container->getAddress->with('123.9.34.23')->returns(new AddressCollection([
-            Address::createFromArray(['country' => 'China']),
-        ]));
+        return new class(new FreeGeoIp(new Client())) extends Geolocation {
+            protected function getAddress(string $ip): Collection
+            {
+                assert($ip, '123.9.34.23');
 
-        return $container->get();
+                return new AddressCollection([
+                    Address::createFromArray(['country' => 'China']),
+                ]);
+            }
+        };
     }
 
-    public function testGeolocation()
+    public function testGeolocation(): void
     {
         $response = Dispatcher::run(
             [
@@ -40,7 +47,7 @@ function ($request) {
         $this->assertEquals('China', (string) $response->getBody());
     }
 
-    public function testAttribute()
+    public function testAttribute(): void
     {
         $geocoder = new FreeGeoIp(new Client(), 'http://freegeoip.net/json/%s');