From 8a55ca264263d27012787cd7d77d010c286c6b02 Mon Sep 17 00:00:00 2001 From: Shift Date: Sun, 16 Feb 2025 20:49:55 +0000 Subject: [PATCH 1/2] Bump dependencies for Laravel 12 --- composer.json | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 7e7ad3a..3596b95 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,9 @@ { "name": "archtechx/laravel-pages", "description": "Easily add routes to your Laravel app by creating Markdown or Blade files.", - "keywords": ["laravel"], + "keywords": [ + "laravel" + ], "type": "library", "license": "MIT", "authors": [ @@ -22,16 +24,16 @@ }, "require": { "php": "^8.2", - "illuminate/support": "^10.0|^11.0", + "illuminate/support": "^10.0|^11.0|^12.0", "archtechx/laravel-seo": "^0.10", "ryangjchandler/orbit": "^1.3", - "illuminate/routing": "^10.0|^11.0", - "illuminate/database": "^10.0|^11.0" + "illuminate/routing": "^10.0|^11.0|^12.0", + "illuminate/database": "^10.0|^11.0|^12.0" }, "require-dev": { - "orchestra/testbench": "^8.0|^9.0", - "pestphp/pest": "^2.0", - "pestphp/pest-plugin-laravel": "^2.0" + "orchestra/testbench": "^8.0|^9.0|^10.0", + "pestphp/pest": "^2.0|^3.7", + "pestphp/pest-plugin-laravel": "^2.0|^3.1" }, "extra": { "laravel": { From 17ce43a0c447d6f14bb3cc74fc21779aeb29443a Mon Sep 17 00:00:00 2001 From: Shift Date: Sun, 16 Feb 2025 20:49:55 +0000 Subject: [PATCH 2/2] Update GitHub Actions for Laravel 12 --- .github/workflows/ci.yml | 53 ++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d08828..72c908e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,47 +3,70 @@ name: CI on: push: pull_request: - branches: [ master ] + branches: + - master jobs: pest: name: Tests (Pest) L${{ matrix.laravel }} + + runs-on: ubuntu-latest + strategy: matrix: - laravel: [10, 11] + laravel: [10, 11, '12'] + steps: - - uses: actions/checkout@v2 - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - tools: composer:v2 - coverage: none - - name: Install composer dependencies - run: composer require "laravel/framework:^${{matrix.laravel}}.0" - - name: Run tests - run: vendor/bin/pest + - uses: actions/checkout@v2 + + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + tools: composer:v2 + coverage: none + + + - name: Install composer dependencies + run: composer require "laravel/framework:^${{matrix.laravel}}.0" + + + - name: Run tests + run: vendor/bin/pest php-cs-fixer: name: Code style (php-cs-fixer) + + runs-on: ubuntu-latest + + steps: - uses: actions/checkout@v2 + + - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: 8.2 tools: composer:v2 coverage: none + + - name: Install php-cs-fixer run: composer global require friendsofphp/php-cs-fixer + + - name: Run php-cs-fixer run: $HOME/.composer/vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php + + - name: Commit changes from php-cs-fixer uses: EndBug/add-and-commit@v5 with: - author_name: "PHP CS Fixer" - author_email: "phpcsfixer@example.com" + author_name: PHP CS Fixer + author_email: phpcsfixer@example.com message: Fix code style (php-cs-fixer)