mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-21 08:41:17 +02:00
Code Issues Releases Wiki Activity

Change Zend namespace to Laminas (#1963)

Browse Source 
Also ensure backwards compatibility for extensions that use the Zend framework but don't explicitly require it.
This commit is contained in:
Matt Kilgore
2020-01-06 16:29:34 -05:00
committed by Franz Liedke
parent c31b004f0c
commit d55daf2a8c
34 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Http/Controller/AbstractHtmlController.php
View File

@@ -10,10 +10,10 @@
namespace Flarum\Http\Controller;
use Illuminate\Contracts\Support\Renderable;
use Laminas\Diactoros\Response\HtmlResponse;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Server\RequestHandlerInterface;
use Zend\Diactoros\Response\HtmlResponse;
abstract class AbstractHtmlController implements RequestHandlerInterface
{

12
framework/core/src/Http/Server.php
View File

@@ -10,13 +10,13 @@
namespace Flarum\Http;
use Flarum\Foundation\SiteInterface;
use Laminas\Diactoros\Response;
use Laminas\Diactoros\ServerRequest;
use Laminas\Diactoros\ServerRequestFactory;
use Laminas\HttpHandlerRunner\Emitter\SapiEmitter;
use Laminas\HttpHandlerRunner\RequestHandlerRunner;
use Laminas\Stratigility\Middleware\ErrorResponseGenerator;
use Throwable;
use Zend\Diactoros\Response;
use Zend\Diactoros\ServerRequest;
use Zend\Diactoros\ServerRequestFactory;
use Zend\HttpHandlerRunner\Emitter\SapiEmitter;
use Zend\HttpHandlerRunner\RequestHandlerRunner;
use Zend\Stratigility\Middleware\ErrorResponseGenerator;
class Server
{