diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml index 2eed0a0..f8a0fe8 100644 --- a/.github/workflows/analyse.yml +++ b/.github/workflows/analyse.yml @@ -9,18 +9,20 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.1] - laravel: [10.*] + php: [8.3] + laravel: [10.*, 11.*] stability: [prefer-stable] include: - laravel: 10.* testbench: 8.* + - laravel: 11.* + testbench: 9.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 701b3bf..c85cbf7 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -9,18 +9,20 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.1] - laravel: [10.*] + php: [8.3] + laravel: [10.*, 11.*] stability: [prefer-stable] include: - laravel: 10.* testbench: 8.* + - laravel: 11.* + testbench: 9.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index efaf7fc..e9a5c3d 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -11,12 +11,12 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.2 + php-version: 8.3 extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo coverage: none diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9e0e0d3..d5c031c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,18 +9,23 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest] - php: [8.1, 8.2] - laravel: [10.*] + php: [8.1, 8.2, 8.3] + laravel: [10.*, 11.*] stability: [prefer-stable] include: - laravel: 10.* testbench: 8.* + - laravel: 11.* + testbench: 9.* + exclude: + - laravel: 11.* + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/composer.json b/composer.json index e4360c6..478b6ae 100644 --- a/composer.json +++ b/composer.json @@ -7,16 +7,16 @@ "php": "^8.1", "brick/money": "^0.7|^0.8", "justbetter/laravel-error-logger": "^2.3", - "justbetter/laravel-magento-client": "^1.1", - "justbetter/laravel-magento-products": "^1.1", - "laravel/framework": "^10.0", - "spatie/laravel-activitylog": "^4.7" + "justbetter/laravel-magento-client": "^2.4", + "justbetter/laravel-magento-products": "^1.4", + "laravel/framework": "^10.0|^11.0", + "spatie/laravel-activitylog": "^4.8" }, "require-dev": { "doctrine/dbal": "^3.4", - "laravel/pint": "^1.6", - "nunomaduro/larastan": "^2.4", - "orchestra/testbench": "^8.11", + "larastan/larastan": "^2.9", + "laravel/pint": "^1.15", + "orchestra/testbench": "^8.0|^9.0", "phpstan/phpstan-mockery": "^1.1", "phpunit/phpunit": "^10.0" }, diff --git a/phpstan.neon b/phpstan.neon index 4438590..75d23d6 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,5 +1,5 @@ includes: - - ./vendor/nunomaduro/larastan/extension.neon + - ./vendor/larastan/larastan/extension.neon - ./vendor/phpstan/phpstan-mockery/extension.neon parameters: diff --git a/tests/TestCase.php b/tests/TestCase.php index 430681f..0d45d00 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -3,6 +3,7 @@ namespace JustBetter\MagentoCustomerPrices\Tests; use Illuminate\Foundation\Testing\LazilyRefreshDatabase; +use JustBetter\MagentoClient\Client\Magento; use JustBetter\MagentoCustomerPrices\ServiceProvider; use Orchestra\Testbench\TestCase as BaseTestCase; use Spatie\Activitylog\ActivitylogServiceProvider; @@ -26,6 +27,7 @@ protected function defineEnvironment($app): void ]); activity()->disableLogging(); + Magento::fake(); } protected function getPackageProviders($app): array