Merge branch '4.x' into dependabot/composer/laminas/laminas-diactoros…

…-tw-2.8
slimphp · Oct 2, 2021 · 14a557b · 14a557b
2 parents d4809a4 + df659aa
commit 14a557b
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 26 deletions.
diff --git a/Slim/Factory/Psr17/Psr17FactoryProvider.php b/Slim/Factory/Psr17/Psr17FactoryProvider.php
@@ -23,7 +23,6 @@ class Psr17FactoryProvider implements Psr17FactoryProviderInterface
         SlimPsr17Factory::class,
         NyholmPsr17Factory::class,
         LaminasDiactorosPsr17Factory::class,
-        ZendDiactorosPsr17Factory::class,
         GuzzlePsr17Factory::class,
     ];
 

diff --git a/Slim/Factory/Psr17/ZendDiactorosPsr17Factory.php b/Slim/Factory/Psr17/ZendDiactorosPsr17Factory.php
diff --git a/tests/Factory/AppFactoryTest.php b/tests/Factory/AppFactoryTest.php
@@ -25,7 +25,6 @@
 use Slim\Factory\Psr17\NyholmPsr17Factory;
 use Slim\Factory\Psr17\Psr17FactoryProvider;
 use Slim\Factory\Psr17\SlimPsr17Factory;
-use Slim\Factory\Psr17\ZendDiactorosPsr17Factory;
 use Slim\Http\Factory\DecoratedResponseFactory;
 use Slim\Http\Response as DecoratedResponse;
 use Slim\Interfaces\CallableResolverInterface;
@@ -37,7 +36,6 @@
 use Slim\Routing\RouteCollector;
 use Slim\Tests\Mocks\MockPsr17FactoryWithoutStreamFactory;
 use Slim\Tests\TestCase;
-use Zend\Diactoros\ResponseFactory as ZendDiactorosResponseFactory;
 
 class AppFactoryTest extends TestCase
 {
@@ -48,7 +46,6 @@ public function provideImplementations()
             [NyholmPsr17Factory::class, Psr17Factory::class],
             [GuzzlePsr17Factory::class, HttpFactory::class],
             [LaminasDiactorosPsr17Factory::class, LaminasDiactorosResponseFactory::class],
-            [ZendDiactorosPsr17Factory::class, ZendDiactorosResponseFactory::class],
         ];
     }
 

diff --git a/tests/Factory/ServerRequestCreatorFactoryTest.php b/tests/Factory/ServerRequestCreatorFactoryTest.php
@@ -21,13 +21,11 @@
 use Slim\Factory\Psr17\Psr17FactoryProvider;
 use Slim\Factory\Psr17\SlimHttpServerRequestCreator;
 use Slim\Factory\Psr17\SlimPsr17Factory;
-use Slim\Factory\Psr17\ZendDiactorosPsr17Factory;
 use Slim\Factory\ServerRequestCreatorFactory;
 use Slim\Http\ServerRequest;
 use Slim\Interfaces\ServerRequestCreatorInterface;
 use Slim\Psr7\Request as SlimServerRequest;
 use Slim\Tests\TestCase;
-use Zend\Diactoros\ServerRequest as ZendDiactorosServerRequest;
 
 class ServerRequestCreatorFactoryTest extends TestCase
 {
@@ -38,7 +36,6 @@ public function provideImplementations()
             [NyholmPsr17Factory::class, NyholmServerRequest::class],
             [GuzzlePsr17Factory::class, GuzzleServerRequest::class],
             [LaminasDiactorosPsr17Factory::class, LaminasDiactorosServerRequest::class],
-            [ZendDiactorosPsr17Factory::class, ZendDiactorosServerRequest::class],
         ];
     }