diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48c7c439..73e24c71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,38 +10,15 @@ jobs: max-parallel: 3 matrix: php: - - '7.2' - - '7.3' - - '7.4' - '8.0' - analysis: [ false ] - coverage: [ 'none' ] + - '8.1' + analysis: [ true ] + coverage: [ 'xdebug' ] normalize: [ false ] - validate: [ false ] + validate: [ true ] laravel: - - '7.0' - - '8.22' + - '8.83' - '9.0' - exclude: - - php: '7.2' - laravel: '8.22' - - php: '7.2' - laravel: '9.0' - - php: '7.3' - laravel: '9.0' - - php: '7.4' - laravel: '9.0' - - php: '8.0' - laravel: '7.0' - - php: '8.0' - laravel: '9.0' - include: - - php: '8.0' - laravel: '9.0' - analysis: true - coverage: 'xdebug' - normalize: true - validate: true name: PHP ${{ matrix.php }} / Laravel ${{ matrix.laravel }} diff --git a/composer.json b/composer.json index f5feb1d3..cb91255e 100644 --- a/composer.json +++ b/composer.json @@ -24,12 +24,12 @@ } ], "require": { - "php": ">=7.2", + "php": ">=8.0", "ext-json": "*", "funeralzone/valueobjects": "^0.5", "jenssegers/agent": "^2.6", - "laravel/framework": "^7.0 || ^8.0 || ^9.0", - "osiset/basic-shopify-api": "^9.0 || <=10.0.5" + "laravel/framework": "^8.0 || ^9.0", + "osiset/basic-shopify-api": "^9.0 || ^10.0.6" }, "require-dev": { "ergebnis/composer-normalize": "^2.8", diff --git a/tests/TestCase.php b/tests/TestCase.php index a2b8a2ce..aadcd889 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -22,20 +22,22 @@ abstract class TestCase extends OrchestraTestCase { + /** + * Fixes the issue with test bench core. + * */ + public static $latestResponse = null; /** * User model. * * @var ShopModel */ protected $model; - /** * Token creation defaults. * * @var array */ protected $tokenDefaults; - /** * Carbon time. * @@ -71,6 +73,15 @@ public function setUp(): void ]; } + protected function setupDatabase($app): void + { + // Run Laravel migrations + $this->loadLaravelMigrations(); + + // Run package migration + $this->artisan('migrate')->run(); + } + protected function getPackageProviders($app): array { // ConsoleServiceProvider required to make migrations work @@ -99,15 +110,6 @@ protected function getEnvironmentSetUp($app): void $app['config']->set('logging.deprecations', 'errorlog'); } - protected function setupDatabase($app): void - { - // Run Laravel migrations - $this->loadLaravelMigrations(); - - // Run package migration - $this->artisan('migrate')->run(); - } - protected function swapEnvironment(string $env, Closure $fn): void { // Get the current environment