From 8fea0ff35abd28a02aea8a57893002b88ccf7095 Mon Sep 17 00:00:00 2001 From: Shift Date: Sun, 16 Feb 2025 23:00:33 +0000 Subject: [PATCH 1/2] Bump dependencies for Laravel 12 --- composer.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 0c0fc84..8dd77e1 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,11 @@ "license": "MIT", "minimum-stability": "dev", "prefer-stable": true, - "keywords": ["ecommerce", "laravel", "vanilo"], + "keywords": [ + "ecommerce", + "laravel", + "vanilo" + ], "support": { "issues": "https://github.com/vanilophp/framework/issues", "source": "https://github.com/vanilophp/contracts" @@ -18,14 +22,16 @@ ], "require": { "php": "^8.2", - "illuminate/support": "^10.43|^11.0", + "illuminate/support": "^10.43|^11.0|^12.0", "nette/schema": "^1.2.5" }, "require-dev": { "phpunit/phpunit": "^10.0" }, "autoload": { - "psr-4": { "Vanilo\\Contracts\\": "" } + "psr-4": { + "Vanilo\\Contracts\\": "" + } }, "extra": { "branch-alias": { From ccf6c7b90879222edfd794ed7a0578dd84bc94d9 Mon Sep 17 00:00:00 2001 From: Shift Date: Sun, 16 Feb 2025 23:00:33 +0000 Subject: [PATCH 2/2] Update GitHub Actions for Laravel 12 --- .github/workflows/tests.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 24002d1..8659dd4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,28 +1,37 @@ name: tests -on: [push] +on: + - push jobs: build: runs-on: ubuntu-latest + timeout-minutes: 10 + strategy: matrix: php: ['8.2', '8.3', '8.4'] - laravel: ['10.43', '10.48', '11.0', '11.35'] + laravel: ['10.43', '10.48', '11.0', '11.35', '12.0'] + name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} + steps: - name: Checkout uses: actions/checkout@master + - name: Installing PHP uses: shivammathur/setup-php@master with: php-version: ${{ matrix.php }} extensions: mbstring, json, sqlite3 tools: composer:v2 + - name: Lock Laravel Version run: composer require "illuminate/support:${{ matrix.laravel }}.*" --no-update -v && composer require "illuminate/console:${{ matrix.laravel }}.*" --no-update -v + - name: Composer Install run: composer install --prefer-dist --no-progress --no-interaction + - name: Run Tests run: php vendor/bin/phpunit --testdox