From 6e12d075c721cda3fe3b9ad863c678df36880d0e Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Tue, 9 Jan 2024 18:13:00 +0800 Subject: [PATCH 1/8] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 04aa10e..2ce30e1 100644 --- a/composer.json +++ b/composer.json @@ -25,15 +25,15 @@ "require": { "php": "^7.3 || ^8.0", "composer-runtime-api": "^2.2", - "illuminate/support": "^8.83.4 || ^9.51 || ^10.0", - "laravie/serialize-queries": "^2.0", + "illuminate/support": "^8.83.4 || ^9.51 || ^10.0 || ^11.0", + "laravie/serialize-queries": "^2.0 || ^3.0", "laravel/serializable-closure": "^1.0" }, "require-dev": { "guzzlehttp/guzzle": "^7.2", "laravel/nova": "^4.14", "nunomaduro/larastan": "^2.4", - "orchestra/testbench": "^7.30 || ^8.10", + "orchestra/testbench": "^7.30 || ^8.19", "phpunit/phpunit": "^9.6", "nova-kit/nova-devtool": "^1.2.1" }, From 3d4968d35ac5c03c94ae6b5d7d0e7d53d11a9590 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 12 Jan 2024 06:23:15 +0800 Subject: [PATCH 2/8] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 2ce30e1..34bf46f 100644 --- a/composer.json +++ b/composer.json @@ -33,8 +33,8 @@ "guzzlehttp/guzzle": "^7.2", "laravel/nova": "^4.14", "nunomaduro/larastan": "^2.4", - "orchestra/testbench": "^7.30 || ^8.19", - "phpunit/phpunit": "^9.6", + "orchestra/testbench": "^7.30 || ^8.19 || ^9.0", + "phpunit/phpunit": "^9.6 || ^10.1", "nova-kit/nova-devtool": "^1.2.1" }, "repositories": [ From afd416e319da1576e02652d087714ef99ba6705f Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 12 Jan 2024 06:26:44 +0800 Subject: [PATCH 3/8] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 34bf46f..90507ea 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ }, "require-dev": { "guzzlehttp/guzzle": "^7.2", - "laravel/nova": "^4.14", + "laravel/nova": "*", "nunomaduro/larastan": "^2.4", "orchestra/testbench": "^7.30 || ^8.19 || ^9.0", "phpunit/phpunit": "^9.6 || ^10.1", From 0148db8517077f9517d264cd39feedfb040bd1e6 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Thu, 7 Mar 2024 09:24:27 +0800 Subject: [PATCH 4/8] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 2 +- phpstan.neon.dist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 90507ea..5b0a255 100644 --- a/composer.json +++ b/composer.json @@ -31,8 +31,8 @@ }, "require-dev": { "guzzlehttp/guzzle": "^7.2", + "larastan/larastan": "^2.4", "laravel/nova": "*", - "nunomaduro/larastan": "^2.4", "orchestra/testbench": "^7.30 || ^8.19 || ^9.0", "phpunit/phpunit": "^9.6 || ^10.1", "nova-kit/nova-devtool": "^1.2.1" diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 335d9a3..14349c5 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,5 +1,5 @@ includes: - - ./vendor/nunomaduro/larastan/extension.neon + - ./vendor/larastan/larastan/extension.neon parameters: From 116bb316332c2124734ef31607a677dffed76791 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Thu, 7 Mar 2024 09:25:38 +0800 Subject: [PATCH 5/8] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index 5b0a255..9bf4dc7 100644 --- a/composer.json +++ b/composer.json @@ -65,6 +65,10 @@ ], "test": [ "@php vendor/bin/phpunit" + ], + "ci": [ + "@lint", + "@test" ] }, "prefer-stable": true, From 76541144bbdbe2a03f620284007295bdb7e3d6b0 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Thu, 7 Mar 2024 09:26:25 +0800 Subject: [PATCH 6/8] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/analyse.yaml | 4 ++-- .github/workflows/audit.yaml | 4 ++-- .github/workflows/tests.yaml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/analyse.yaml b/.github/workflows/analyse.yaml index 05d5575..70a5b97 100644 --- a/.github/workflows/analyse.yaml +++ b/.github/workflows/analyse.yaml @@ -22,7 +22,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -40,7 +40,7 @@ jobs: composer require "laravel/pint:^1.1" --no-interaction --no-update - name: Install dependencies - uses: "ramsey/composer-install@v2" + uses: "ramsey/composer-install@v3" with: dependency-versions: "highest" composer-options: "--prefer-dist --no-cache" diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml index 697660d..6e10944 100644 --- a/.github/workflows/audit.yaml +++ b/.github/workflows/audit.yaml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -39,7 +39,7 @@ jobs: composer config http-basic.nova.laravel.com ${{ secrets.NOVA_USERNAME }} ${{ secrets.NOVA_PASSWORD }} - name: Install dependencies - uses: "ramsey/composer-install@v2" + uses: "ramsey/composer-install@v3" with: dependency-versions: "highest" composer-options: "--prefer-dist --prefer-stable --no-cache" diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index ce9fdfc..38ac5fd 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -28,7 +28,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -46,7 +46,7 @@ jobs: composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update - name: Install dependencies - uses: "ramsey/composer-install@v2" + uses: "ramsey/composer-install@v3" with: dependency-versions: "${{ matrix.dependencies }}" composer-options: "--prefer-dist --no-cache" @@ -79,7 +79,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -97,7 +97,7 @@ jobs: composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update - name: Install dependencies - uses: "ramsey/composer-install@v2" + uses: "ramsey/composer-install@v3" with: dependency-versions: "${{ matrix.dependencies }}" composer-options: "--prefer-dist --no-cache" From c6d22b8586a1f64e93b66ad6a6637eeb4d1b9a52 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Thu, 7 Mar 2024 09:27:02 +0800 Subject: [PATCH 7/8] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 38ac5fd..e8467a7 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -41,15 +41,11 @@ jobs: run: | composer config http-basic.nova.laravel.com ${{ secrets.NOVA_USERNAME }} ${{ secrets.NOVA_PASSWORD }} - - name: Install Laravel Framework ${{ matrix.laravel }} - run: | - composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update - - name: Install dependencies uses: "ramsey/composer-install@v3" with: dependency-versions: "${{ matrix.dependencies }}" - composer-options: "--prefer-dist --no-cache" + composer-options: "--prefer-dist --no-cache --with=laravel/framework:${{ matrix.laravel }}" - name: Installed dependencies run: composer show -D @@ -92,15 +88,11 @@ jobs: run: | composer config http-basic.nova.laravel.com ${{ secrets.NOVA_USERNAME }} ${{ secrets.NOVA_PASSWORD }} - - name: Install Laravel Framework ${{ matrix.laravel }} - run: | - composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update - - name: Install dependencies uses: "ramsey/composer-install@v3" with: dependency-versions: "${{ matrix.dependencies }}" - composer-options: "--prefer-dist --no-cache" + composer-options: "--prefer-dist --no-cache --with=laravel/framework:${{ matrix.laravel }}" - name: Installed dependencies run: composer show -D From 9bca6d741d728b09bbe5b93a0d905cbbc069dea4 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Thu, 7 Mar 2024 09:28:09 +0800 Subject: [PATCH 8/8] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yaml | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index e8467a7..fdde103 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -6,6 +6,52 @@ on: workflow_dispatch: jobs: + tests-on-laravel-11: + runs-on: ${{ matrix.os }} + continue-on-error: ${{ matrix.experimental }} + strategy: + matrix: + os: + - "ubuntu-latest" + php: + - 8.2 + - 8.3 + dependencies: + - "highest" + laravel: + - "11.x" + experimental: + - false + + name: Laravel ${{ matrix.laravel }} on PHP${{ matrix.php }}-${{ matrix.os }} (${{ matrix.dependencies }}) + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlite3, pdo_sqlite, bcmath, fileinfo + coverage: none + + - name: "Setup CI Authentication" + run: | + composer config http-basic.nova.laravel.com ${{ secrets.NOVA_USERNAME }} ${{ secrets.NOVA_PASSWORD }} + + - name: Install dependencies + uses: "ramsey/composer-install@v3" + with: + dependency-versions: "${{ matrix.dependencies }}" + composer-options: "--prefer-dist --no-cache --with=laravel/framework:${{ matrix.laravel }}" + + - name: Installed dependencies + run: composer show -D + + - name: Execute tests + run: vendor/bin/phpunit --testdox + tests-on-laravel-10: runs-on: ${{ matrix.os }} continue-on-error: ${{ matrix.experimental }}