Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 35 additions & 13 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,57 @@ name: PHP Composer

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
laravel: [ '^12.0', '^13.0' ]

name: Laravel ${{ matrix.laravel }}

steps:
- uses: actions/checkout@v7

- name: Validate composer.json and composer.lock
run: composer validate --strict
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.4'
coverage: none

- name: Validate composer.json
run: composer validate --strict --no-check-lock

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v6
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
key: ${{ runner.os }}-php-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }}
restore-keys: |
${{ runner.os }}-php-
${{ runner.os }}-php-${{ matrix.laravel }}-

- name: Pin Laravel version
run: |
composer require --no-update --no-interaction \
"illuminate/cache:${{ matrix.laravel }}" \
"illuminate/console:${{ matrix.laravel }}" \
"illuminate/contracts:${{ matrix.laravel }}" \
"illuminate/database:${{ matrix.laravel }}" \
"illuminate/filesystem:${{ matrix.laravel }}" \
"illuminate/http:${{ matrix.laravel }}" \
"illuminate/support:${{ matrix.laravel }}" \
"illuminate/view:${{ matrix.laravel }}"

- name: Install dependencies
run: composer install --prefer-dist --no-progress
run: composer update --prefer-dist --no-progress --no-interaction

# Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
# Docs: https://getcomposer.org/doc/articles/scripts.md
- name: Show resolved Laravel version
run: composer show illuminate/support | head -3

# - name: Run test suite
# run: composer run-script test
- name: Run test suite
run: composer run-script test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Thumbs.db
.env.*.php
.env.php
.phpunit.result.cache
.phplint.cache/

# sublime phpintel plugin
/.phpintel
73 changes: 17 additions & 56 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,67 +3,24 @@
"description": "This package provides a flexible way to add role-based permissions to Laravel and is a fork from Zizaco/entrust",
"type": "library",
"license": "MIT",
"minimum-stability": "dev",
"prefer-stable": false,
"minimum-stability": "stable",
"prefer-stable": true,
"require": {
"php": "^8.4",
"doctrine/inflector": "^2.0.8",
"illuminate/bus": "^13.0",
"illuminate/cache": "^13.0",
"illuminate/collections": "^13.0",
"illuminate/conditionable": "^13.0",
"illuminate/console": "^13.0",
"illuminate/container": "^13.0",
"illuminate/contracts": "^13.0",
"illuminate/events": "^13.0",
"illuminate/filesystem": "^13.0",
"illuminate/macroable": "^13.0",
"illuminate/pipeline": "^13.0",
"illuminate/support": "^13.0",
"illuminate/view": "^13.0",
"illuminate/database": "^13.0",
"laravel/prompts": "^0.3",
"nesbot/carbon": "^3.8.4",
"nunomaduro/termwind": "^2.3",
"psr/clock": "^1.0.0",
"psr/container": "^2.0.2",
"psr/simple-cache": "^3.0.0",
"symfony/console": "^8.0",
"symfony/deprecation-contracts": "^3.5",
"symfony/finder": "^8.0",
"symfony/polyfill-ctype": "^1.0.0",
"symfony/polyfill-intl-grapheme": "^1.0.0",
"symfony/polyfill-intl-normalizer": "^1.0.0",
"symfony/polyfill-mbstring": "^1.0.0",
"symfony/polyfill-php80": "^1.0.0",
"symfony/process": "^8.0",
"symfony/service-contracts": "^3.5",
"symfony/string": "^8.0",
"symfony/translation": "^8.0",
"symfony/translation-contracts": "^3.5",
"voku/portable-ascii": "^2.0.1",

"psr/cache": "^3.0.0",
"psr/event-dispatcher": "^1.0.0",
"psr/log": "^3.0.0",
"symfony/cache": "^8.0",
"symfony/cache-contracts": "^3.5",
"symfony/event-dispatcher": "^8.0",
"symfony/event-dispatcher-contracts": "^3.5",
"symfony/options-resolver": "^8.0",
"symfony/var-exporter": "^8.0",
"symfony/yaml": "^8.0"
"illuminate/cache": "^12.0|^13.0",
"illuminate/console": "^12.0|^13.0",
"illuminate/contracts": "^12.0|^13.0",
"illuminate/database": "^12.0|^13.0",
"illuminate/filesystem": "^12.0|^13.0",
"illuminate/http": "^12.0|^13.0",
"illuminate/support": "^12.0|^13.0",
"illuminate/view": "^12.0|^13.0"
},
"require-dev": {
"phpunit/phpunit": "^12.0",
"mockery/mockery": "^2.0",
"mockery/mockery": "^1.6",
"overtrue/phplint": "^9.0.3",
"phpunit/php-code-coverage": "^12.0",
"phpunit/php-file-iterator": "^6.0",
"phpunit/php-invoker": "^6.0",
"phpunit/php-text-template": "^5.0",
"phpunit/php-timer": "^8.0",
"rector/rector": "dev-main"
"phpunit/phpunit": "^12.0",
"rector/rector": "^2.0"
},
"autoload": {
"classmap": [
Expand Down Expand Up @@ -92,5 +49,9 @@
"platform": {
"php": "8.4"
}
},
"scripts": {
"test": "phpunit",
"lint": "phplint"
}
}
Loading
Loading