add Fatfree PSR7 package

.github/workflows/fatfree.yml

@@ -0,0 +1,19 @@
+name: Fatfree
+
+on:
+  push:
+    branches:
+      - '*.x'
+  pull_request:
+
+jobs:
+  latest:
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ '8.0', '8.1', '8.2', '8.3' ]
+    uses: ./.github/workflows/integration.yml
+    with:
+      php: ${{ matrix.php }}
+      suite: Fatfree
+      package: f3-factory/fatfree-psr7

.github/workflows/integration.yml

@@ -32,7 +32,7 @@ jobs:
         # then we install the dependencies
         # and finally require the implementation to test with source flag (to get integration test cases that might be excluded in git-attributes)
         run: |
-          composer remove --dev guzzlehttp/psr7 laminas/laminas-diactoros nyholm/psr7 ringcentral/psr7 slim/psr7 httpsoft/http-message --no-update
+          composer remove --dev guzzlehttp/psr7 laminas/laminas-diactoros nyholm/psr7 ringcentral/psr7 slim/psr7 httpsoft/http-message f3-factory/fatfree-psr7 --no-update
           composer require ${{ inputs.package }} --no-interaction --no-progress --prefer-source
 
       - name: Execute tests

README.md

@@ -6,14 +6,15 @@
 
 ## Status
 
-| PSR7 Implementation | Status        | Legacy |
-| ------------------- |:-------------:|:------:|
-| Guzzle              | [![Guzzle](https://github.com/php-http/psr7-integration-tests/actions/workflows/guzzle.yml/badge.svg)](https://github.com/php-http/psr7-integration-tests/actions/workflows/guzzle.yml)                |
-| Laminas             | [![Laminas](https://github.com/php-http/psr7-integration-tests/actions/workflows/laminas.yml/badge.svg)](https://github.com/php-http/psr7-integration-tests/actions/workflows/laminas.yml)             |  [Legacy](https://github.com/php-http/psr7-integration-tests/actions/workflows/laminas-legacy.yml) (failures expected) |
-| Slim                | [![Slim](https://github.com/php-http/psr7-integration-tests/actions/workflows/slim.yml/badge.svg)](https://github.com/php-http/psr7-integration-tests/actions/workflows/slim.yml)                      |
-| Nyholm              | [![Nyholm](https://github.com/php-http/psr7-integration-tests/actions/workflows/nyholm.yml/badge.svg)](https://github.com/php-http/psr7-integration-tests/actions/workflows/nyholm.yml)                |
+| PSR7 Implementation |                                                                                                 Status                                                                                                 |                                                        Legacy                                                         |
+|---------------------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------:|
+| Guzzle              |        [![Guzzle](https://github.com/php-http/psr7-integration-tests/actions/workflows/guzzle.yml/badge.svg)](https://github.com/php-http/psr7-integration-tests/actions/workflows/guzzle.yml)         |
+| Laminas             |       [![Laminas](https://github.com/php-http/psr7-integration-tests/actions/workflows/laminas.yml/badge.svg)](https://github.com/php-http/psr7-integration-tests/actions/workflows/laminas.yml)       | [Legacy](https://github.com/php-http/psr7-integration-tests/actions/workflows/laminas-legacy.yml) (failures expected) |
+| Slim                |           [![Slim](https://github.com/php-http/psr7-integration-tests/actions/workflows/slim.yml/badge.svg)](https://github.com/php-http/psr7-integration-tests/actions/workflows/slim.yml)            |
+| Nyholm              |        [![Nyholm](https://github.com/php-http/psr7-integration-tests/actions/workflows/nyholm.yml/badge.svg)](https://github.com/php-http/psr7-integration-tests/actions/workflows/nyholm.yml)         |
 | RingCentral         | [![RingCentral](https://github.com/php-http/psr7-integration-tests/actions/workflows/ringcentral.yml/badge.svg)](https://github.com/php-http/psr7-integration-tests/actions/workflows/ringcentral.yml) |
-| HttpSoft            |  [![HttpSoft](https://github.com/php-http/psr7-integration-tests/actions/workflows/httpsoft.yml/badge.svg)](https://github.com/php-http/psr7-integration-tests/actions/workflows/httpsoft.yml)         |
+| HttpSoft            |     [![HttpSoft](https://github.com/php-http/psr7-integration-tests/actions/workflows/httpsoft.yml/badge.svg)](https://github.com/php-http/psr7-integration-tests/actions/workflows/httpsoft.yml)      |
+| Fatfree             |      [![HttpSoft](https://github.com/php-http/psr7-integration-tests/actions/workflows/fatfree.yml/badge.svg)](https://github.com/php-http/psr7-integration-tests/actions/workflows/fatfree.yml)       |
 
 ## Install
 
@@ -46,7 +47,7 @@ Run the test suite for one implementation with:
 $ composer test -- --testsuite <name>
 ```
 
-The names are `Guzzle`, `Laminas`, `Slim`, `Nyholm`, `RingCentral`.
+The names are `Guzzle`, `Laminas`, `Slim`, `Nyholm`, `RingCentral`, `HttpSoft`, `Fatfree`.
 
 It is also possible to exclude tests that require a live internet connection:
 

composer.json

@@ -19,6 +19,7 @@
         "psr/http-message": "^1.0 || ^2.0"
     },
     "require-dev": {
+        "f3-factory/fatfree-psr7": "^2.0",
         "guzzlehttp/psr7": "^1.7 || ^2.0",
         "httpsoft/http-message": "^1.1",
         "laminas/laminas-diactoros": "^2.1",

phpunit.xml.dist

@@ -31,9 +31,11 @@
     <testsuite name="Nyholm">
       <directory>./vendor/nyholm/psr7/tests/Integration/</directory>
     </testsuite>
-
     <testsuite name="HttpSoft">
         <directory>./vendor/httpsoft/http-message/tests/Integration/</directory>
     </testsuite>
+    <testsuite name="Fatfree">
+        <directory>./vendor/f3-factory/fatfree-psr7/tests/Integration/</directory>
+    </testsuite>
   </testsuites>
 </phpunit>

src/BaseTest.php

@@ -2,6 +2,7 @@
 
 namespace Http\Psr7Test;
 
+use F3\Http\Factory\Psr17Factory as FatfreeFactory;
 use GuzzleHttp\Psr7\Stream as GuzzleStream;
 use GuzzleHttp\Psr7\UploadedFile as GuzzleUploadedFile;
 use GuzzleHttp\Psr7\Uri as GuzzleUri;
@@ -84,6 +85,10 @@ protected function buildUri($uri)
             return new RingCentralUri($uri);
         }
 
+        if (class_exists(FatfreeFactory::class)) {
+            return (new FatfreeFactory())->createUri($uri);
+        }
+
         throw new \RuntimeException('Could not create URI. Check your config');
     }
 
@@ -123,6 +128,9 @@ protected function buildStream($data)
         if (class_exists(SlimStreamFactory::class)) {
             $factory = new SlimStreamFactory();
         }
+        if (class_exists(FatfreeFactory::class)) {
+            $factory = new FatfreeFactory();
+        }
         if ($factory) {
             if (is_string($data)) {
                 return $factory->createStream($data);
@@ -176,6 +184,12 @@ protected function buildUploadableFile($data)
             return (new SlimUploadedFileFactory())->createUploadedFile($stream);
         }
 
+        if (class_exists(FatfreeFactory::class)) {
+            $stream = $this->buildStream($data);
+
+            return (new FatfreeFactory())->createUploadedFile($stream);
+        }
+
         throw new \RuntimeException('Could not create Stream. Check your config');
     }
 }