Skip to content

Commit

Permalink
Merge branch 'master' of github.com:timgavin/laravel-block
Browse files Browse the repository at this point in the history
  • Loading branch information
timgavin committed Oct 25, 2022
2 parents 22261dd + 1a2b316 commit 516c248
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/LaravelBlockServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class LaravelBlockServiceProvider extends ServiceProvider
*/
public function boot(): void
{
$this->loadMigrationsFrom(__DIR__.'/../database/migrations');
$this->loadMigrationsFrom(__DIR__ . '/../database/migrations');

if ($this->app->runningInConsole()) {
$this->bootForConsole();
Expand All @@ -27,7 +27,7 @@ public function boot(): void
*/
public function register(): void
{
$this->mergeConfigFrom(__DIR__.'/../config/laravel-block.php', 'laravel-block');
$this->mergeConfigFrom(__DIR__ . '/../config/laravel-block.php', 'laravel-block');

// Register the service the package provides.
$this->app->singleton('laravel-block', function ($app) {
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ protected function getPackageProviders($app)

protected function getEnvironmentSetUp($app)
{
include_once __DIR__.'/migrations/create_users_table.php';
include_once __DIR__ . '/migrations/create_users_table.php';

(new \CreateUsersTable)->up();
}
Expand Down

0 comments on commit 516c248

Please sign in to comment.