Skip to content

Commit

Permalink
Merge pull request slimphp#2912 from adriansuter/patch-laminas
Browse files Browse the repository at this point in the history
Add Laminas PSR17 Factory
  • Loading branch information
l0gicgate authored Jan 3, 2020
2 parents cf68c2d + 79fd882 commit b2c2883
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 2 deletions.
19 changes: 19 additions & 0 deletions Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

/**
* Slim Framework (https://slimframework.com)
*
* @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
*/

declare(strict_types=1);

namespace Slim\Factory\Psr17;

class LaminasDiactorosPsr17Factory extends Psr17Factory
{
protected static $responseFactoryClass = 'Laminas\Diactoros\ResponseFactory';
protected static $streamFactoryClass = 'Laminas\Diactoros\StreamFactory';
protected static $serverRequestCreatorClass = 'Laminas\Diactoros\ServerRequestFactory';
protected static $serverRequestCreatorMethod = 'fromGlobals';
}
1 change: 1 addition & 0 deletions Slim/Factory/Psr17/Psr17FactoryProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class Psr17FactoryProvider implements Psr17FactoryProviderInterface
protected static $factories = [
SlimPsr17Factory::class,
NyholmPsr17Factory::class,
LaminasDiactorosPsr17Factory::class,
ZendDiactorosPsr17Factory::class,
GuzzlePsr17Factory::class,
];
Expand Down
3 changes: 3 additions & 0 deletions tests/Factory/AppFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
namespace Slim\Tests\Factory;

use Http\Factory\Guzzle\ResponseFactory as GuzzleResponseFactory;
use Laminas\Diactoros\ResponseFactory as LaminasDiactorosResponseFactory;
use Nyholm\Psr7\Factory\Psr17Factory;
use Psr\Container\ContainerInterface;
use Psr\Http\Message\ResponseFactoryInterface;
Expand All @@ -20,6 +21,7 @@
use RuntimeException;
use Slim\Factory\AppFactory;
use Slim\Factory\Psr17\GuzzlePsr17Factory;
use Slim\Factory\Psr17\LaminasDiactorosPsr17Factory;
use Slim\Factory\Psr17\NyholmPsr17Factory;
use Slim\Factory\Psr17\Psr17FactoryProvider;
use Slim\Factory\Psr17\SlimPsr17Factory;
Expand All @@ -45,6 +47,7 @@ public function provideImplementations()
[SlimPsr17Factory::class, SlimResponseFactory::class],
[NyholmPsr17Factory::class, Psr17Factory::class],
[GuzzlePsr17Factory::class, GuzzleResponseFactory::class],
[LaminasDiactorosPsr17Factory::class, LaminasDiactorosResponseFactory::class],
[ZendDiactorosPsr17Factory::class, ZendDiactorosResponseFactory::class],
];
}
Expand Down
7 changes: 5 additions & 2 deletions tests/Factory/ServerRequestCreatorFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
namespace Slim\Tests\Factory;

use GuzzleHttp\Psr7\ServerRequest as GuzzleServerRequest;
use Laminas\Diactoros\ServerRequest as LaminasDiactorosServerRequest;
use Nyholm\Psr7\ServerRequest as NyholmServerRequest;
use Psr\Http\Message\ServerRequestInterface;
use RuntimeException;
use Slim\Factory\Psr17\GuzzlePsr17Factory;
use Slim\Factory\Psr17\LaminasDiactorosPsr17Factory;
use Slim\Factory\Psr17\NyholmPsr17Factory;
use Slim\Factory\Psr17\Psr17FactoryProvider;
use Slim\Factory\Psr17\SlimHttpServerRequestCreator;
Expand All @@ -25,7 +27,7 @@
use Slim\Interfaces\ServerRequestCreatorInterface;
use Slim\Psr7\Request as SlimServerRequest;
use Slim\Tests\TestCase;
use Zend\Diactoros\ServerRequest as ZendServerRequest;
use Zend\Diactoros\ServerRequest as ZendDiactorosServerRequest;

class ServerRequestCreatorFactoryTest extends TestCase
{
Expand All @@ -35,7 +37,8 @@ public function provideImplementations()
[SlimPsr17Factory::class, SlimServerRequest::class],
[NyholmPsr17Factory::class, NyholmServerRequest::class],
[GuzzlePsr17Factory::class, GuzzleServerRequest::class],
[ZendDiactorosPsr17Factory::class, ZendServerRequest::class],
[LaminasDiactorosPsr17Factory::class, LaminasDiactorosServerRequest::class],
[ZendDiactorosPsr17Factory::class, ZendDiactorosServerRequest::class],
];
}

Expand Down

0 comments on commit b2c2883

Please sign in to comment.