From 47794bcc1de92fdabdce801e4cf4c2088a9f6b27 Mon Sep 17 00:00:00 2001 From: Arthur Kirkosa Date: Sun, 2 Mar 2025 11:08:59 +0200 Subject: [PATCH 1/2] Allow Laravel 12 --- .github/workflows/run-tests.yml | 10 +++++++--- composer.json | 8 ++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index cdfb08f..8eeaa2e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,23 +13,27 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.1, 8.2] - laravel: [10.*, 11.*] + php: [8.1, 8.2, 8.3, 8.4] + laravel: [10.*, 11.*, 12.*] stability: [prefer-lowest, prefer-stable] include: - laravel: 10.* testbench: 8.* - laravel: 11.* testbench: 9.* + - laravel: 12.* + testbench: 10.* exclude: - laravel: 11.* php: 8.1 + - laravel: 12.* + 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 ec88cec..1e6b00c 100644 --- a/composer.json +++ b/composer.json @@ -23,13 +23,13 @@ } ], "require": { - "php": "^8.1", - "illuminate/contracts": "^10.0|^11.0" + "php": "^8.1|^8.2", + "illuminate/contracts": "^10.0|^11.0|^12.0" }, "require-dev": { "brianium/paratest": "^6.3|^7.0", - "orchestra/testbench": "^8.0|^9.0", - "phpunit/phpunit": "^9.3.3|^10.0|^11.0", + "orchestra/testbench": "^8.0|^9.0|^10.0", + "phpunit/phpunit": "^9.3.3|^10.0|^11.0|^12.0", "spatie/laravel-ray": "^1.9", "vimeo/psalm": "^4.4|^5.0|^6.0" }, From 30d5d2510090da16f810841f2abe07713a6643ba Mon Sep 17 00:00:00 2001 From: Arthur Kirkosa Date: Sun, 2 Mar 2025 11:14:26 +0200 Subject: [PATCH 2/2] Update GitHub stuff --- .github/ISSUE_TEMPLATE/config.yml | 6 ++--- .github/workflows/auto-release.yml | 2 +- .github/workflows/php-cs-fixer.yml | 4 +-- .github/workflows/psalm.yml | 42 +++++++++++++++--------------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 7e8bd27..5ace379 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,11 +1,11 @@ blank_issues_enabled: false contact_links: - name: Ask a question - url: https://github.com/BinarCode/laravel-restify/discussions/new?category=q-a + url: https://github.com/BinarCode/laravel-tenantable/discussions/new?category=q-a about: Ask the community for help - name: Request a feature - url: https://github.com/BinarCode/laravel-restify/discussions/new?category=ideas + url: https://github.com/BinarCode/laravel-tenantable/discussions/new?category=ideas about: Share ideas for new features - name: Report a bug - url: https://github.com/BinarCode/laravel-restify/issues/new + url: https://github.com/BinarCode/laravel-tenantable/issues/new about: Report a reproducable bug diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 220e6fe..172cbe6 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -12,7 +12,7 @@ jobs: if: github.event.pull_request.merged == true runs-on: "ubuntu-latest" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: ncipollo/release-action@v1 with: name: ${{ github.event.pull_request.title }} diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml index f55d1fa..fbec801 100644 --- a/.github/workflows/php-cs-fixer.yml +++ b/.github/workflows/php-cs-fixer.yml @@ -8,7 +8,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{ github.head_ref }} @@ -18,6 +18,6 @@ jobs: args: --config=.php_cs.dist.php --allow-risky=yes - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Fix styling diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 01eb00e..84852ec 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -1,33 +1,33 @@ name: Psalm on: - push: - paths: - - '**.php' - - 'psalm.xml.dist' + push: + paths: + - '**.php' + - 'psalm.xml.dist' jobs: - psalm: + psalm: name: psalm runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: '8.1' - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick - coverage: none + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: '8.2' + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick + coverage: none - - name: Cache composer dependencies - uses: actions/cache@v2 - with: - path: vendor - key: composer-${{ hashFiles('composer.lock') }} + - name: Cache composer dependencies + uses: actions/cache@v4 + with: + path: vendor + key: composer-${{ hashFiles('composer.lock') }} - - name: Run composer install - run: composer install -n --prefer-dist + - name: Run composer install + run: composer install -n --prefer-dist - - name: Run psalm - run: ./vendor/bin/psalm --output-format=github + - name: Run psalm + run: ./vendor/bin/psalm --output-format=github