Skip to content

Commit

Permalink
Update dependencies (#99)
Browse files Browse the repository at this point in the history
* Update dependencies

* Update github build script

* Update Laravel Test Case base file to set default db to testing

* Require simple cache 2.0 for excel support

* Update changelog

Co-authored-by: Rachel Sloan <[email protected]>
  • Loading branch information
rsloan-mlbsolutions and Rachel Sloan authored Dec 9, 2022
1 parent 94d6e38 commit 94d3272
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 26 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/laravel-report-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ jobs:
strategy:
fail-fast: true
matrix:
php: ["7.4", "8.0", "8.1"]
laravel: ["^8.0", "^9.0"]
exclude:
- php: "7.4"
laravel: "^9.0"
php: ["8.0", "8.1"]
laravel: ["^9.0"]

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}

Expand Down
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v5.0.0

+ Update dependencies to support Laravel 9

## v4.3.1

+ Add extended attributes to schedule frequency
Expand Down
29 changes: 15 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,27 @@
}
],
"require": {
"php": "^7.4||^8.0",
"php": "^8.0",
"ext-json": "*",
"illuminate/cache": "^8.0||^9.0",
"illuminate/console": "^8.0||^9.0",
"illuminate/contracts": "^8.0||^9.0",
"illuminate/database": "^8.0||^9.0",
"illuminate/events": "^8.0||^9.0",
"illuminate/filesystem": "^8.0||^9.0",
"illuminate/queue": "^8.0||^9.0",
"illuminate/support": "^8.0||^9.0",
"illuminate/http": "^8.0||^9.0",
"illuminate/cache": "^9.0",
"illuminate/console": "^9.0",
"illuminate/contracts": "^9.0",
"illuminate/database": "^9.0",
"illuminate/events": "^9.0",
"illuminate/filesystem": "^9.0",
"illuminate/queue": "^9.0",
"illuminate/support": "^9.0",
"illuminate/http": "^9.0",
"maatwebsite/excel": "^3.1",
"lerouse/laravel-repository": "^1.0||^2.0",
"lerouse/laravel-repository": "^2.0",
"laravel/legacy-factories": "^1.2",
"doctrine/dbal": "^3.3"
"doctrine/dbal": "^3.3",
"psr/simple-cache": "^2.0"
},
"require-dev": {
"mockery/mockery": "~1.0",
"orchestra/testbench": "^4.0||^5.0||^6.0||^7.0",
"phpunit/phpunit": "^7.3||^8.2||^9.3"
"orchestra/testbench": "^7.0",
"phpunit/phpunit": "^9.5"
},
"autoload": {
"psr-4": {
Expand Down
13 changes: 6 additions & 7 deletions tests/LaravelTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace MBLSolutions\Report\Tests;

use Faker\Factory;
use Illuminate\Foundation\Application;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Collection;
Expand All @@ -14,6 +13,7 @@
use MBLSolutions\Report\Tests\Fakes\Middleware\FakeMiddleware;
use MBLSolutions\Report\Tests\Fakes\User;
use Orchestra\Testbench\TestCase as OTBTestCase;
use Illuminate\Support\Facades\DB;

class LaravelTestCase extends OTBTestCase
{
Expand All @@ -24,12 +24,14 @@ protected function setUp(): void
{
parent::setUp();

$this->setupEnvVariables();
DB::setDefaultConnection('sqlite');

$this->runPackageMigrations();
$this->setupEnvVariables();

$this->loadTestMigrations();

$this->runPackageMigrations();

$this->loadModelFactories();

Report::routes();
Expand All @@ -41,7 +43,7 @@ protected function setUp(): void
* @param Application $app
* @return void
*/
protected function getEnvironmentSetUp($app): void
protected function defineEnvironment($app): void
{
$config = include __DIR__ . '/../config/report.php';

Expand All @@ -60,7 +62,6 @@ protected function getEnvironmentSetUp($app): void
$app['config']->set('report.scheduled_date_end', $config['scheduled_date_end']);
$app['config']->set('report.chunk_limit', 5);
$app['config']->set('report.link_expiration', $config['link_expiration']);

}

/**
Expand All @@ -83,8 +84,6 @@ protected function getPackageProviders($app): array
private function runPackageMigrations(): void
{
$this->loadMigrationsFrom(__DIR__ . '/../database/migrations');

$this->artisan('migrate')->run();
}

/**
Expand Down

0 comments on commit 94d3272

Please sign in to comment.