Docker: Fix PHP tests

[bookstack] / app / Providers / PaginationServiceProvider.php

diff --git a/app/Providers/PaginationServiceProvider.php b/app/Providers/PaginationServiceProvider.php
index a0e97f70db42a508f1fcf1e1114e0ad5681654f7..1c982b82eacd26610861d49cfdcf71bc1e5a02c3 100644 (file)
--- a/app/Providers/PaginationServiceProvider.php
+++ b/app/Providers/PaginationServiceProvider.php
@@ -1,11 +1,11 @@
 <?php namespace BookStack\Providers;
 
-
-use Illuminate\Support\ServiceProvider;
+use Illuminate\Pagination\PaginationServiceProvider as IlluminatePaginationServiceProvider;
 use Illuminate\Pagination\Paginator;
 
-class PaginationServiceProvider extends ServiceProvider
+class PaginationServiceProvider extends IlluminatePaginationServiceProvider
 {
+
     /**
      * Register the service provider.
      *
@@ -13,8 +13,12 @@ class PaginationServiceProvider extends ServiceProvider
      */
     public function register()
     {
+        Paginator::viewFactoryResolver(function () {
+            return $this->app['view'];
+        });
+
         Paginator::currentPathResolver(function () {
-            return baseUrl($this->app['request']->path());
+            return url($this->app['request']->path());
         });
 
         Paginator::currentPageResolver(function ($pageName = 'page') {
@@ -27,4 +31,4 @@ class PaginationServiceProvider extends ServiceProvider
             return 1;
         });
     }
-}
\ No newline at end of file
+}