Merge branch 'php-8.1'

Closes #33

Author: akrabat

.github/workflows/unit-tests.yml

@@ -12,14 +12,12 @@ jobs:
 
     strategy:
       matrix:
-        dependencies:
-          - "lowest"
-          - "highest"
         php-version:
           - "7.2"
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
         operating-system:
           - "ubuntu-latest"
 
@@ -43,15 +41,10 @@ jobs:
           path: |
             ~/.composer/cache
             vendor
-          key: "php-${{ matrix.php-version }}-${{ matrix.dependencies }}"
-          restore-keys: "php-${{ matrix.php-version }}-${{ matrix.dependencies }}"
-
-      - name: "Install lowest dependencies"
-        if: ${{ matrix.dependencies == 'lowest' }}
-        run: "composer update --prefer-lowest --no-interaction --no-progress --no-suggest"
+          key: "php-${{ matrix.php-version }}"
+          restore-keys: "php-${{ matrix.php-version }}"
 
       - name: "Install highest dependencies"
-        if: ${{ matrix.dependencies == 'highest' }}
         run: "composer update --no-interaction --no-progress --no-suggest"
 
       - name: "Tests"

.gitignore

@@ -1,3 +1,4 @@
 build
 vendor
 composer.lock
+.phpunit.result.cache

phpunit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.7/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          backupGlobals="false"
          backupStaticAttributes="false"
          beStrictAboutTestsThatDoNotTestAnything="true"
@@ -20,9 +20,9 @@
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
+        </include>
+    </coverage>
+</phpunit>

src/IpAddress.php

@@ -162,7 +162,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
      */
     protected function determineClientIpAddress($request)
     {
-        $ipAddress = null;
+        $ipAddress = '';
 
         $serverParams = $request->getServerParams();
         if (isset($serverParams['REMOTE_ADDR'])) {
@@ -234,6 +234,10 @@ protected function determineClientIpAddress($request)
             }
         }
 
+        if (empty($ipAddress)) {
+            $ipAddress = null;
+        }
+
         return $ipAddress;
     }
 

tests/IpAddressTest.php

@@ -128,6 +128,17 @@ public function testIpIsNullIfMissing()
         $this->assertNull($ipAddress);
     }
 
+    public function testIpIsNullIfMissingAndProxiesAreConfigured()
+    {
+        error_reporting(-1);
+        $middleware = new IPAddress(true, ['*'], 'IP');
+        $env = [];
+        $ipAddress = $this->simpleRequest($middleware, $env, 'IP');
+
+        $this->assertSame(null, $ipAddress);
+    }
+
+
     public function testXForwardedForIp()
     {
         $middleware = new IPAddress(true, []);