From f45a1608dfcf358b12b233821d1f25be6173de31 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Fri, 1 May 2020 09:53:55 +0000
Subject: [PATCH] Split up Application and Container

- Stop trying to implement Laravel's Application contract, which
  has no value for us.
- Stop inheriting from the Container, injecting one works equally
  well and does not clutter up the interfaces.
- Inject the Paths collection instead of unwrapping it again, for
  better encapsulation.

This brings us one step closer toward upgrading our Laravel
components (#2055), because we no longer need to adopt the changes
to the Application contract.
---
 php-packages/testing/tests/integration/TestCase.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/php-packages/testing/tests/integration/TestCase.php b/php-packages/testing/tests/integration/TestCase.php
index ea22a5a42..cf35bbcf1 100644
--- a/php-packages/testing/tests/integration/TestCase.php
+++ b/php-packages/testing/tests/integration/TestCase.php
@@ -11,6 +11,7 @@ namespace Flarum\Tests\integration;
 
 use Flarum\Extend\ExtenderInterface;
 use Flarum\Foundation\InstalledSite;
+use Flarum\Foundation\Paths;
 use Illuminate\Database\ConnectionInterface;
 use Laminas\Diactoros\ServerRequest;
 use Psr\Http\Message\ResponseInterface;
@@ -33,12 +34,12 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
     {
         if (is_null($this->app)) {
             $site = new InstalledSite(
-                [
+                new Paths([
                     'base' => __DIR__.'/tmp',
                     'vendor' => __DIR__.'/../../vendor',
                     'public' => __DIR__.'/tmp/public',
                     'storage' => __DIR__.'/tmp/storage',
-                ],
+                ]),
                 include __DIR__.'/tmp/config.php'
             );