Merge pull request #4 from tbreuss/feat-upgrade

Support for PHP 7.4, 8.0, 8.1, replace zend framework with laminas

.gitignore

@@ -0,0 +1,4 @@
+/.idea
+/.phpunit.result.cache
+/composer.lock
+/vendor

.travis.yml

@@ -1,6 +1,7 @@
 language: php
 php:
-- '7.1'
-- '7.2'
+- '7.4'
+- '8.0'
+- '8.1'
 install: composer install
 script: composer test

README.md

@@ -7,9 +7,9 @@
 [![License](https://img.shields.io/github/license/tbreuss/http-factory.svg)](https://github.com/tbreuss/http-factory/blob/master/LICENSE)
 [![PHP from Packagist](https://img.shields.io/packagist/php-v/tebe/http-factory.svg)](https://packagist.org/packages/tebe/http-factory)
 
-
 HTTP-Factory is a PHP package that implements [PSR-17 HTTP factories](https://www.php-fig.org/psr/psr-17/) interface.
-It offers auto-discovering support and acts as a simple facade to allow easy access to concrete HTTP Factory packages.
+It acts as a simple facade to provide easy access to concrete HTTP factory packets.
+As its main feature it offers support for auto-discovery of the supported factories.
 
 All PSR-17 interfaces are implemented:
 
@@ -19,27 +19,26 @@ All PSR-17 interfaces are implemented:
 - Psr\Http\Message\UploadedFileFactoryInterface
 - Psr\Http\Message\UriFactoryInterface
 
-Additionally it implements a createServerRequestFromGlobals method, which is not part of PSR-17.
+Additionally, it implements a createServerRequestFromGlobals method, which is not part of PSR-17.
 
 ## Auto-discovering PSR-7 packages 
 
 The package features auto-discovery support for the following PSR-7 packages:
 
-1. zendframework/zend-diactoros
+1. laminas/laminas-diactoros
 2. guzzlehttp/psr7  
 3. slim/slim
 4. nyholm/psr7
 
 The auto-discovery mechanism assumes that you are using one (and only one) of the above PSR-7 packages in your project.
 The first detected PSR-17 package will then be used for all interface factory methods.
 
-
 ## Installation
 
 When starting a new project one of the following PSR-7 packages must be installed.
 
 ~~~bash
-$ composer require zendframework/zend-diactoros
+$ composer require laminas/laminas-diactoros
 $ composer require guzzlehttp/psr7
 $ composer require slim/slim
 $ composer require nyholm/psr7
@@ -95,7 +94,6 @@ $factory->createUploadedFile(
 ); 
 ~~~
 
-
 ## Usage
 
 ### Using constructor

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "tebe/http-factory",
   "type": "library",
-  "description": "HTTP-Factory with auto-discovery support implementing PSR-17",
+  "description": "HTTP Factory provides automatic detection for Composer packages implementing the PSR-17 standard",
   "license": "MIT",
   "keywords": [
     "psr-7",
@@ -12,18 +12,18 @@
     "http"
   ],
   "require": {
-    "php": "^7.1",
+    "php": ">=7.4",
     "psr/http-message": "^1.0",
     "psr/http-factory": "^1.0"
   },
   "require-dev": {
-    "zendframework/zend-diactoros": "^1.8",
-    "slim/slim": "^3.10",
-    "guzzlehttp/psr7": "^1.4",
-    "squizlabs/php_codesniffer": "^3.3",
-    "phpunit/phpunit": "^6.5",
+    "laminas/laminas-diactoros": "^2.0",
+    "slim/slim": "^3.0",
+    "squizlabs/php_codesniffer": "^3.0",
     "nyholm/psr7": "^1.0",
-    "nyholm/psr7-server": "^0.3.0"
+    "phpunit/phpunit": "^9.0",
+    "nyholm/psr7-server": "^1.0",
+    "guzzlehttp/psr7": "^2.0"
   },
   "autoload": {
     "psr-4": {

src/Factory/DiactorosFactory.php

@@ -3,32 +3,32 @@
 
 namespace Tebe\HttpFactory\Factory;
 
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\ServerRequest;
+use Laminas\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\Stream;
+use Laminas\Diactoros\UploadedFile;
+use Laminas\Diactoros\Uri;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
 use Psr\Http\Message\UriInterface;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\ServerRequest;
-use Zend\Diactoros\ServerRequestFactory;
-use Zend\Diactoros\Stream;
-use Zend\Diactoros\UploadedFile;
-use Zend\Diactoros\Uri;
 
 /**
  * Simple class to create response instances of PSR-7 classes.
  */
 class DiactorosFactory implements FactoryInterface
 {
     /**
-     * Check whether Zend Diactoros is available
+     * Check whether Laminas Diactoros is available
      */
     public static function isInstalled(): bool
     {
-        return class_exists('Zend\\Diactoros\\Response')
-            && class_exists('Zend\\Diactoros\\ServerRequest')
-            && class_exists('Zend\\Diactoros\\Stream')
-            && class_exists('Zend\\Diactoros\\Uri');
+        return class_exists('Laminas\\Diactoros\\Response')
+            && class_exists('Laminas\\Diactoros\\ServerRequest')
+            && class_exists('Laminas\\Diactoros\\Stream')
+            && class_exists('Laminas\\Diactoros\\Uri');
     }
 
     /**

tests/Factory/DiactorosFactoryTest.php

@@ -2,14 +2,13 @@
 
 namespace Tests\Tebe\HttpFactory;
 
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\ServerRequest;
+use Laminas\Diactoros\Stream;
+use Laminas\Diactoros\Uri;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\UploadedFileInterface;
 use Tebe\HttpFactory\Factory\DiactorosFactory;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\ServerRequest;
-use Zend\Diactoros\Stream;
-use Zend\Diactoros\UploadedFile;
-use Zend\Diactoros\Uri;
 
 class DiactorosFactoryTest extends TestCase
 {
@@ -18,7 +17,7 @@ class DiactorosFactoryTest extends TestCase
      */
     private $factory;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->factory = new DiactorosFactory();
     }

tests/Factory/GuzzleFactoryTest.php

@@ -17,7 +17,7 @@ class GuzzleFactoryTest extends TestCase
      */
     private $factory;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->factory = new GuzzleFactory();
     }

tests/Factory/NyholmFactoryTest.php

@@ -17,7 +17,7 @@ class NyholmFactoryTest extends TestCase
      */
     private $factory;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->factory = new NyholmFactory();
     }

tests/Factory/SlimFactoryTest.php

@@ -17,7 +17,7 @@ class SlimeFactoryTest extends TestCase
      */
     private $factory;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->factory = new SlimFactory();
     }

tests/HttpFactoryTest.php

@@ -22,7 +22,7 @@ class HttpFactoryTest extends TestCase
      */
     private $factory;
 
-    public function setUp()
+    protected function setUp(): void
     {
         HttpFactory::setStrategies([
             DiactorosFactory::class,