remove support for obsolete zend diactoros

Author: dbu

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.16.0 (unreleased)
+
+- [#x]() - Remove support for the abandoned Zend Diactoros which has been replaced with Laminas Diactoros. Marked as conflict in composer.json to avoid confusion.
+
 ## 1.15.3 - 2023-03-31
 
 - [#224](https://github.com/php-http/discovery/pull/224) - Fix regression with Magento classloader
@@ -31,7 +35,7 @@
 
 ## 1.14.1 - 2021-09-18
 
-- [#199](https://github.com/php-http/discovery/pull/199) - Fixes message factory discovery for `laminas-diactoros ^2.7` 
+- [#199](https://github.com/php-http/discovery/pull/199) - Fixes message factory discovery for `laminas-diactoros ^2.7`
 
 ## 1.14.0 - 2021-06-21
 

composer.json

@@ -52,7 +52,8 @@
         "plugin-optional": true
     },
     "conflict": {
-        "nyholm/psr7": "<1.0"
+        "nyholm/psr7": "<1.0",
+        "zendframework/zend-diactoros": "*"
     },
     "prefer-stable": true,
     "minimum-stability": "beta"

src/Strategy/CommonPsr17ClassesStrategy.php

@@ -25,7 +25,6 @@ final class CommonPsr17ClassesStrategy implements DiscoveryStrategy
         RequestFactoryInterface::class => [
             'Phalcon\Http\Message\RequestFactory',
             'Nyholm\Psr7\Factory\Psr17Factory',
-            'Zend\Diactoros\RequestFactory',
             'GuzzleHttp\Psr7\HttpFactory',
             'Http\Factory\Diactoros\RequestFactory',
             'Http\Factory\Guzzle\RequestFactory',
@@ -36,7 +35,6 @@ final class CommonPsr17ClassesStrategy implements DiscoveryStrategy
         ResponseFactoryInterface::class => [
             'Phalcon\Http\Message\ResponseFactory',
             'Nyholm\Psr7\Factory\Psr17Factory',
-            'Zend\Diactoros\ResponseFactory',
             'GuzzleHttp\Psr7\HttpFactory',
             'Http\Factory\Diactoros\ResponseFactory',
             'Http\Factory\Guzzle\ResponseFactory',
@@ -47,7 +45,6 @@ final class CommonPsr17ClassesStrategy implements DiscoveryStrategy
         ServerRequestFactoryInterface::class => [
             'Phalcon\Http\Message\ServerRequestFactory',
             'Nyholm\Psr7\Factory\Psr17Factory',
-            'Zend\Diactoros\ServerRequestFactory',
             'GuzzleHttp\Psr7\HttpFactory',
             'Http\Factory\Diactoros\ServerRequestFactory',
             'Http\Factory\Guzzle\ServerRequestFactory',
@@ -58,7 +55,6 @@ final class CommonPsr17ClassesStrategy implements DiscoveryStrategy
         StreamFactoryInterface::class => [
             'Phalcon\Http\Message\StreamFactory',
             'Nyholm\Psr7\Factory\Psr17Factory',
-            'Zend\Diactoros\StreamFactory',
             'GuzzleHttp\Psr7\HttpFactory',
             'Http\Factory\Diactoros\StreamFactory',
             'Http\Factory\Guzzle\StreamFactory',
@@ -69,7 +65,6 @@ final class CommonPsr17ClassesStrategy implements DiscoveryStrategy
         UploadedFileFactoryInterface::class => [
             'Phalcon\Http\Message\UploadedFileFactory',
             'Nyholm\Psr7\Factory\Psr17Factory',
-            'Zend\Diactoros\UploadedFileFactory',
             'GuzzleHttp\Psr7\HttpFactory',
             'Http\Factory\Diactoros\UploadedFileFactory',
             'Http\Factory\Guzzle\UploadedFileFactory',
@@ -80,7 +75,6 @@ final class CommonPsr17ClassesStrategy implements DiscoveryStrategy
         UriFactoryInterface::class => [
             'Phalcon\Http\Message\UriFactory',
             'Nyholm\Psr7\Factory\Psr17Factory',
-            'Zend\Diactoros\UriFactory',
             'GuzzleHttp\Psr7\HttpFactory',
             'Http\Factory\Diactoros\UriFactory',
             'Http\Factory\Guzzle\UriFactory',