1
0
mirror of https://github.com/flarum/core.git synced 2025-08-01 22:20:21 +02:00

Change Zend namespace to Laminas (#1963)

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 ca0c52d60a
commit d7a5a6ad14
34 changed files with 50 additions and 49 deletions

View File

@@ -11,10 +11,10 @@ namespace Flarum\Foundation\ErrorHandling;
use Flarum\Settings\SettingsRepositoryInterface;
use Illuminate\Contracts\View\Factory as ViewFactory;
use Laminas\Diactoros\Response\HtmlResponse;
use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request;
use Symfony\Component\Translation\TranslatorInterface;
use Zend\Diactoros\Response\HtmlResponse;
/**
* A formatter for turning caught exceptions into "pretty" HTML error pages.

View File

@@ -17,11 +17,11 @@ use Flarum\Foundation\Console\InfoCommand;
use Flarum\Http\Middleware\DispatchRoute;
use Flarum\Settings\SettingsRepositoryInterface;
use Illuminate\Contracts\Container\Container;
use Laminas\Stratigility\Middleware\OriginalMessages;
use Laminas\Stratigility\MiddlewarePipe;
use Middlewares\BasePath;
use Middlewares\BasePathRouter;
use Middlewares\RequestHandler;
use Zend\Stratigility\Middleware\OriginalMessages;
use Zend\Stratigility\MiddlewarePipe;
class InstalledApp implements AppInterface
{

View File

@@ -10,12 +10,12 @@
namespace Flarum\Foundation;
use Illuminate\Support\Str;
use Laminas\Diactoros\Response\HtmlResponse;
use Laminas\Diactoros\Response\JsonResponse;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\RequestHandlerInterface;
use Tobscure\JsonApi\Document;
use Zend\Diactoros\Response\HtmlResponse;
use Zend\Diactoros\Response\JsonResponse;
class MaintenanceModeHandler implements RequestHandlerInterface
{