Change Zend namespace to Laminas (#1963)

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

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {