1
0
mirror of https://github.com/flarum/core.git synced 2025-07-31 13:40:20 +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

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

View File

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