[5.4] fix Call to undefined method resourcePath()

[xcaptain]

lumen 5.3 app doesn't have resourcePath method, use basePath instead

[2016-10-02 15:14:43] lumen.ERROR: Symfony\Component\Debug\Exception\FatalThrowableError: Call to undefined method Laravel\Lumen\Application::resourcePath() in /var/www/proj1/vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php:71
Stack trace:

0 /var/www/proj1/vendor/laravel/framework/src/Illuminate/Pagination/PaginationServiceProvider.php(16): Illuminate\Support\ServiceProvider->loadViewsFrom('/var/www/proj1-...', 'pagination')

1 [internal function]: Illuminate\Pagination\PaginationServiceProvider->boot()

2 /var/www/proj1/vendor/laravel/framework/src/Illuminate/Container/Container.php(508): call_user_func_array(Array, Array)

3 /var/www/proj1/vendor/laravel/lumen-framework/src/Application.php(177): Illuminate\Container\Container->call(Array)

4 /var/www/proj1/vendor/laravel/lumen-framework/src/Application.php(563): Laravel\Lumen\Application->register(Object(Illuminate\Pagination\PaginationServiceProvider))

5 /var/www/proj1/vendor/laravel/lumen-framework/src/Application.php(315): Laravel\Lumen\Application->loadComponent('database', Array, 'db')

6 /var/www/proj1/vendor/laravel/framework/src/Illuminate/Container/Container.php(746): Laravel\Lumen\Application->Laravel\Lumen{closure}(Object(Laravel\Lumen\Application), Array)

7 /var/www/proj1/vendor/laravel/framework/src/Illuminate/Container/Container.php(644): Illuminate\Container\Container->build(Object(Closure), Array)

8 /var/www/proj1/vendor/laravel/lumen-framework/src/Application.php(211): Illuminate\Container\Container->make('db', Array)

9 /var/www/proj1/vendor/laravel/lumen-framework/src/Application.php(674): Laravel\Lumen\Application->make('db')

10 /var/www/proj1/bootstrap/app.php(41): Laravel\Lumen\Application->withEloquent()

11 /var/www/proj1/public/index.php(14): require('/var/www/proj1-...')

12 {main}

[GrahamCampbell]

Please send this to 5.3 rather than 5.4.

[xcaptain]

@GrahamCampbell You mean I should make a new merge request to branch 5.3 rather than master?

[GrahamCampbell]

No, since that'll have 5.4 commits in it. You'll need to cherry-pick your commit onto a 5.3 based branch first.

[xcaptain]

@GrahamCampbell In my local repo I first run git checkout -b 5.3 and then git pull upstream 5.3, but the 5.3 branch has conflicts with master branch So I can't apply this fix in my local repo, can you be more specific about what should I do or can you fix this bug for me ?