Change Zend namespace to Laminas (#1963)

Also ensure backwards compatibility for extensions that use the Zend framework but don't explicitly require it.

framework/core/composer.json

@@ -46,6 +46,10 @@
         "illuminate/validation": "5.7.*",
         "illuminate/view": "5.7.*",
         "intervention/image": "^2.3.0",
+        "laminas/laminas-diactoros": "^1.8.4",
+        "laminas/laminas-httphandlerrunner": "^1.0",
+        "laminas/laminas-stratigility": "^3.0",
+        "laminas/laminas-zendframework-bridge": "^1.0",
         "league/flysystem": "^1.0.11",
         "matthiasmullie/minify": "^1.3",
         "middlewares/base-path": "^1.1",
@@ -63,10 +67,7 @@
         "symfony/event-dispatcher": "^4.3.2",
         "symfony/translation": "^3.3",
         "symfony/yaml": "^3.3",
-        "tobscure/json-api": "^0.3.0",
-        "zendframework/zend-diactoros": "^1.8.4",
-        "zendframework/zend-httphandlerrunner": "^1.0",
-        "zendframework/zend-stratigility": "^3.0"
+        "tobscure/json-api": "^0.3.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",

framework/core/src/Admin/AdminServiceProvider.php

@@ -29,7 +29,7 @@ use Flarum\Http\RouteHandlerFactory;
 use Flarum\Http\UrlGenerator;
 use Flarum\Locale\LocaleManager;
 use Flarum\Settings\Event\Saved;
-use Zend\Stratigility\MiddlewarePipe;
+use Laminas\Stratigility\MiddlewarePipe;
 
 class AdminServiceProvider extends AbstractServiceProvider
 {

framework/core/src/Api/ApiServiceProvider.php

@@ -25,7 +25,7 @@ use Flarum\Http\Middleware as HttpMiddleware;
 use Flarum\Http\RouteCollection;
 use Flarum\Http\RouteHandlerFactory;
 use Flarum\Http\UrlGenerator;
-use Zend\Stratigility\MiddlewarePipe;
+use Laminas\Stratigility\MiddlewarePipe;
 
 class ApiServiceProvider extends AbstractServiceProvider
 {

framework/core/src/Api/Client.php

@@ -15,10 +15,10 @@ use Flarum\Foundation\ErrorHandling\Registry;
 use Flarum\User\User;
 use Illuminate\Contracts\Container\Container;
 use InvalidArgumentException;
+use Laminas\Diactoros\ServerRequestFactory;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Throwable;
-use Zend\Diactoros\ServerRequestFactory;
 
 class Client
 {

framework/core/src/Api/Controller/AbstractDeleteController.php

@@ -9,10 +9,10 @@
 
 namespace Flarum\Api\Controller;
 
+use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\EmptyResponse;
 
 abstract class AbstractDeleteController implements RequestHandlerInterface
 {

framework/core/src/Api/Controller/ClearCacheController.php

@@ -11,10 +11,10 @@ namespace Flarum\Api\Controller;
 
 use Flarum\Foundation\Console\CacheClearCommand;
 use Flarum\User\AssertPermissionTrait;
+use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
-use Zend\Diactoros\Response\EmptyResponse;
 
 class ClearCacheController extends AbstractDeleteController
 {

framework/core/src/Api/Controller/CreateTokenController.php

@@ -15,10 +15,10 @@ use Flarum\User\UserRepository;
 use Illuminate\Contracts\Bus\Dispatcher as BusDispatcher;
 use Illuminate\Contracts\Events\Dispatcher as EventDispatcher;
 use Illuminate\Support\Arr;
+use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\JsonResponse;
 
 class CreateTokenController implements RequestHandlerInterface
 {

framework/core/src/Api/Controller/DeleteFaviconController.php

@@ -12,10 +12,10 @@ namespace Flarum\Api\Controller;
 use Flarum\Foundation\Application;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\AssertPermissionTrait;
+use Laminas\Diactoros\Response\EmptyResponse;
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\Filesystem;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response\EmptyResponse;
 
 class DeleteFaviconController extends AbstractDeleteController
 {

framework/core/src/Api/Controller/DeleteLogoController.php

@@ -12,10 +12,10 @@ namespace Flarum\Api\Controller;
 use Flarum\Foundation\Application;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\AssertPermissionTrait;
+use Laminas\Diactoros\Response\EmptyResponse;
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\Filesystem;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response\EmptyResponse;
 
 class DeleteLogoController extends AbstractDeleteController
 {

framework/core/src/Api/Controller/ForgotPasswordController.php

@@ -13,10 +13,10 @@ use Flarum\User\Command\RequestPasswordReset;
 use Flarum\User\UserRepository;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Illuminate\Support\Arr;
+use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\EmptyResponse;
 
 class ForgotPasswordController implements RequestHandlerInterface
 {

framework/core/src/Api/Controller/SendConfirmationEmailController.php

@@ -17,11 +17,11 @@ use Flarum\User\Exception\PermissionDeniedException;
 use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Mail\Message;
 use Illuminate\Support\Arr;
+use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-use Zend\Diactoros\Response\EmptyResponse;
 
 class SendConfirmationEmailController implements RequestHandlerInterface
 {

framework/core/src/Api/Controller/SetPermissionController.php

@@ -12,10 +12,10 @@ namespace Flarum\Api\Controller;
 use Flarum\Group\Permission;
 use Flarum\User\AssertPermissionTrait;
 use Illuminate\Support\Arr;
+use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\EmptyResponse;
 
 class SetPermissionController implements RequestHandlerInterface
 {

framework/core/src/Api/Controller/SetSettingsController.php

@@ -13,10 +13,10 @@ use Flarum\Settings\Event;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\AssertPermissionTrait;
 use Illuminate\Contracts\Events\Dispatcher;
+use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\EmptyResponse;
 
 class SetSettingsController implements RequestHandlerInterface
 {

framework/core/src/Api/Controller/UpdateExtensionController.php

@@ -12,10 +12,10 @@ namespace Flarum\Api\Controller;
 use Flarum\Extension\ExtensionManager;
 use Flarum\User\AssertPermissionTrait;
 use Illuminate\Support\Arr;
+use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\EmptyResponse;
 
 class UpdateExtensionController implements RequestHandlerInterface
 {

framework/core/src/Api/JsonApiResponse.php

@@ -9,8 +9,8 @@
 
 namespace Flarum\Api;
 
+use Laminas\Diactoros\Response\JsonResponse;
 use Tobscure\JsonApi\Document;
-use Zend\Diactoros\Response\JsonResponse;
 
 class JsonApiResponse extends JsonResponse
 {

framework/core/src/Event/ConfigureMiddleware.php

@@ -9,7 +9,7 @@
 
 namespace Flarum\Event;
 
-use Zend\Stratigility\MiddlewarePipe;
+use Laminas\Stratigility\MiddlewarePipe;
 
 /**
  * @deprecated

framework/core/src/Extend/Middleware.php

@@ -11,7 +11,7 @@ namespace Flarum\Extend;
 
 use Flarum\Extension\Extension;
 use Illuminate\Contracts\Container\Container;
-use Zend\Stratigility\MiddlewarePipe;
+use Laminas\Stratigility\MiddlewarePipe;
 
 class Middleware implements ExtenderInterface
 {

framework/core/src/Forum/Auth/ResponseFactory.php

@@ -14,8 +14,8 @@ use Flarum\User\LoginProvider;
 use Flarum\User\RegistrationToken;
 use Flarum\User\User;
 use Illuminate\Support\Arr;
+use Laminas\Diactoros\Response\HtmlResponse;
 use Psr\Http\Message\ResponseInterface;
-use Zend\Diactoros\Response\HtmlResponse;
 
 class ResponseFactory
 {

framework/core/src/Forum/Controller/ConfirmEmailController.php

@@ -14,10 +14,10 @@ use Flarum\Http\SessionAuthenticator;
 use Flarum\User\Command\ConfirmEmail;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Illuminate\Support\Arr;
+use Laminas\Diactoros\Response\RedirectResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\RedirectResponse;
 
 class ConfirmEmailController implements RequestHandlerInterface
 {

framework/core/src/Forum/Controller/LogOutController.php

@@ -19,11 +19,11 @@ use Flarum\User\Event\LoggedOut;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Support\Arr;
+use Laminas\Diactoros\Response\HtmlResponse;
+use Laminas\Diactoros\Response\RedirectResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\HtmlResponse;
-use Zend\Diactoros\Response\RedirectResponse;
 
 class LogOutController implements RequestHandlerInterface
 {

framework/core/src/Forum/Controller/SavePasswordController.php

@@ -19,10 +19,10 @@ use Illuminate\Contracts\Validation\Factory;
 use Illuminate\Support\Arr;
 use Illuminate\Support\MessageBag;
 use Illuminate\Validation\ValidationException;
+use Laminas\Diactoros\Response\RedirectResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\RedirectResponse;
 
 class SavePasswordController implements RequestHandlerInterface
 {

framework/core/src/Forum/ForumServiceProvider.php

@@ -34,8 +34,8 @@ use Flarum\Locale\LocaleManager;
 use Flarum\Settings\Event\Saved;
 use Flarum\Settings\Event\Saving;
 use Flarum\Settings\SettingsRepositoryInterface;
+use Laminas\Stratigility\MiddlewarePipe;
 use Symfony\Component\Translation\TranslatorInterface;
-use Zend\Stratigility\MiddlewarePipe;
 
 class ForumServiceProvider extends AbstractServiceProvider
 {

framework/core/src/Foundation/ErrorHandling/ViewFormatter.php

@@ -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.

framework/core/src/Foundation/InstalledApp.php

@@ -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
 {

framework/core/src/Foundation/MaintenanceModeHandler.php

@@ -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
 {

framework/core/src/Frontend/Controller.php

@@ -9,10 +9,10 @@
 
 namespace Flarum\Frontend;
 
+use Laminas\Diactoros\Response\HtmlResponse;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\HtmlResponse;
 
 class Controller implements RequestHandlerInterface
 {

framework/core/src/Http/Controller/AbstractHtmlController.php

@@ -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
 {

framework/core/src/Http/Server.php

@@ -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
 {

framework/core/src/Install/Controller/InstallController.php

@@ -18,10 +18,10 @@ use Flarum\Install\StepFailed;
 use Flarum\Install\ValidationFailed;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
+use Laminas\Diactoros\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response;
 
 class InstallController implements RequestHandlerInterface
 {

framework/core/src/Install/Installer.php

@@ -18,7 +18,7 @@ use Flarum\Http\Middleware\HandleErrors;
 use Flarum\Http\Middleware\StartSession;
 use Flarum\Install\Console\InstallCommand;
 use Illuminate\Contracts\Container\Container;
-use Zend\Stratigility\MiddlewarePipe;
+use Laminas\Stratigility\MiddlewarePipe;
 
 class Installer implements AppInterface
 {

framework/core/src/Update/Controller/UpdateController.php

@@ -13,13 +13,13 @@ use Exception;
 use Flarum\Database\Console\MigrateCommand;
 use Flarum\Foundation\Application;
 use Illuminate\Support\Arr;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\Response\HtmlResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\RequestHandlerInterface;
 use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\StreamOutput;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Response\HtmlResponse;
 
 class UpdateController implements RequestHandlerInterface
 {

framework/core/tests/integration/TestCase.php

@@ -12,10 +12,10 @@ namespace Flarum\Tests\integration;
 use Dflydev\FigCookies\SetCookie;
 use Flarum\Foundation\InstalledSite;
 use Illuminate\Database\ConnectionInterface;
+use Laminas\Diactoros\CallbackStream;
+use Laminas\Diactoros\ServerRequest;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\CallbackStream;
-use Zend\Diactoros\ServerRequest;
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase
 {

framework/core/tests/integration/api/Auth/AuthenticateWithApiKeyTest.php

@@ -18,13 +18,13 @@ use Flarum\Tests\integration\TestCase;
 use Flarum\User\Guest;
 use Flarum\User\User;
 use Illuminate\Support\Str;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\ServerRequestFactory;
+use Laminas\Stratigility\MiddlewarePipe;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\ServerRequestFactory;
-use Zend\Stratigility\MiddlewarePipe;
 
 class AuthenticateWithApiKeyTest extends TestCase
 {

framework/core/tests/unit/Install/BaseUrlTest.php

@@ -11,7 +11,7 @@ namespace Flarum\Tests\unit\Install;
 
 use Flarum\Install\BaseUrl;
 use Flarum\Tests\unit\TestCase;
-use Zend\Diactoros\Uri;
+use Laminas\Diactoros\Uri;
 
 class BaseUrlTest extends TestCase
 {