Updated service provider reference, added phpunit env var

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 1c6180a1f4b3c3329bbb28632b4bca076cd19b8e..7673050f8f51bd8d1105ac3a4c6f5e79f7a25885 100644 (file)
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -8,6 +8,7 @@ use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use BookStack\Settings\Setting;
 use BookStack\Settings\SettingService;
 use BookStack\Entities\Models\Page;
 use BookStack\Settings\Setting;
 use BookStack\Settings\SettingService;

+use Illuminate\Contracts\Cache\Repository;

 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;


@@ -59,7 +60,7 @@ class AppServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->singleton(SettingService::class, function ($app) {
     public function register()
     {
         $this->app->singleton(SettingService::class, function ($app) {

-            return new SettingService($app->make(Setting::class), $app->make('Illuminate\Contracts\Cache\Repository'));
+            return new SettingService($app->make(Setting::class), $app->make(Repository::class));

         });
     }
 }
         });
     }
 }

diff --git a/phpunit.xml b/phpunit.xml
index 8d69a5fddd3a8eee35101cceff94c6e3acd567ec..0332182883ceb77a5b477842593053aa5181ee11 100644 (file)
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -55,5 +55,6 @@
         <server name="API_REQUESTS_PER_MIN" value="180"/>
         <server name="LOG_FAILED_LOGIN_MESSAGE" value=""/>
         <server name="LOG_FAILED_LOGIN_CHANNEL" value="testing"/>
         <server name="API_REQUESTS_PER_MIN" value="180"/>
         <server name="LOG_FAILED_LOGIN_MESSAGE" value=""/>
         <server name="LOG_FAILED_LOGIN_CHANNEL" value="testing"/>

+        <server name="WKHTMLTOPDF" value="false"/>

     </php>
 </phpunit>
     </php>
 </phpunit>