Skip to content

Commit e08d0c3

Browse files
authored
Merge pull request #19 from TappNetwork/ds_store
Laravel 12 Support / Remove .DS_Store files
2 parents d648936 + d4fd113 commit e08d0c3

File tree

13 files changed

+293
-83
lines changed

13 files changed

+293
-83
lines changed

.DS_Store

-8 KB
Binary file not shown.

.github/workflows/larastan.yml

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1-
name: Larastan
1+
name: PHPStan
2+
23
on:
3-
- push
4+
push:
5+
paths:
6+
- '**.php'
7+
- 'phpstan.neon.dist'
8+
- '.github/workflows/phpstan.yml'
9+
410
jobs:
5-
test:
6-
strategy:
7-
matrix:
8-
operating-system:
9-
- ubuntu-latest
10-
php-version:
11-
- "8.2"
12-
name: php ${{ matrix.php-version }} on ${{ matrix.operating-system }}
13-
runs-on: ${{ matrix.operating-system }}
11+
phpstan:
12+
name: phpstan
13+
runs-on: ubuntu-latest
14+
timeout-minutes: 5
1415
steps:
15-
- name: Checkout
16-
uses: actions/checkout@v4
16+
- uses: actions/checkout@v4
17+
1718
- name: Setup PHP
1819
uses: shivammathur/setup-php@v2
1920
with:
20-
php-version: ${{ matrix.php-version }}
21-
extensions: bcmath, ctype, fileinfo, json, mbstring, openssl, pdo, tokenizer, xml
21+
php-version: '8.3'
2222
coverage: none
23+
2324
- name: Install composer dependencies
24-
env:
25-
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
26-
run: |
27-
composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
28-
- name: Larastan
29-
run: ./vendor/bin/phpstan analyse
25+
uses: ramsey/composer-install@v3
26+
27+
- name: Run PHPStan
28+
run: ./vendor/bin/phpstan --error-format=github

.github/workflows/run-tests.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ jobs:
1818
matrix:
1919
os: [ubuntu-latest]
2020
php: [8.4, 8.3]
21-
laravel: [11.*]
21+
laravel: [12.*, 11.*]
2222
stability: [prefer-lowest, prefer-stable]
2323
include:
24+
- laravel: 12.*
25+
testbench: 10.*
2426
- laravel: 11.*
2527
testbench: 9.*
26-
carbon: ^2.63
2728

2829
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2930

@@ -47,7 +48,7 @@ jobs:
4748
env:
4849
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
4950
run: |
50-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.os == 'windows-latest' && '^^^' || '' }}${{ matrix.carbon }}" --no-interaction --no-update
51+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
5152
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
5253
5354
- name: List Installed Dependencies

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
/.log/
44
composer.lock
55
build/*
6+
.DS_Store
7+
.phpunit.cache/

composer.json

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,46 @@
22
"name": "tapp/filament-lms",
33
"type": "library",
44
"license": "MIT",
5-
"autoload": {
6-
"psr-4": {
7-
"Tapp\\FilamentLms\\": "src/",
8-
"Tapp\\FilamentLms\\Database\\Factories\\": "database/factories/",
9-
"Tapp\\FilamentLms\\Tests\\": "tests/",
10-
"Workbench\\App\\": "workbench/app/"
11-
}
12-
},
135
"authors": [
146
{
157
"name": "Tapp Network"
168
}
179
],
1810
"minimum-stability": "dev",
1911
"require": {
20-
"filament/spatie-laravel-media-library-plugin": "^3.2",
12+
"php": "^8.3",
2113
"filament/filament": "^3.2",
14+
"filament/spatie-laravel-media-library-plugin": "^3.2",
2215
"filament/support": "^3.0",
16+
"illuminate/contracts": "^10.0||^11.0||^12.0",
2317
"spatie/eloquent-sortable": "^4.4.0",
2418
"tapp/filament-form-builder": "dev-main"
2519
},
2620
"require-dev": {
2721
"laravel/pint": "^1.14",
2822
"nunomaduro/collision": "^8.1.1||^7.10.0",
29-
"larastan/larastan": "^2.9",
30-
"orchestra/testbench": "^9.0.0||^8.22.0",
31-
"pestphp/pest": "^3.0",
32-
"pestphp/pest-plugin-arch": "^3.0",
33-
"pestphp/pest-plugin-laravel": "^3.0",
34-
"phpstan/extension-installer": "^1.3",
35-
"phpstan/phpstan-deprecation-rules": "^1.1",
36-
"phpstan/phpstan-phpunit": "^1.3",
23+
"larastan/larastan": "^2.9||^3.0",
24+
"orchestra/testbench": "^10.0.0||^9.0.0||^8.22.0",
25+
"pestphp/pest": "^3.0||^2.34",
26+
"pestphp/pest-plugin-arch": "^3.0||^2.7",
27+
"pestphp/pest-plugin-laravel": "^3.0||^2.3",
28+
"phpstan/extension-installer": "^1.3||^2.0",
29+
"phpstan/phpstan-deprecation-rules": "^1.1||^2.0",
30+
"phpstan/phpstan-phpunit": "^1.3||^2.0",
3731
"spatie/laravel-ray": "^1.35"
3832
},
33+
"autoload": {
34+
"psr-4": {
35+
"Tapp\\FilamentLms\\": "src/",
36+
"Tapp\\FilamentLms\\Database\\Factories\\": "database/factories/"
37+
}
38+
},
39+
"autoload-dev": {
40+
"psr-4": {
41+
"Tapp\\FilamentLms\\Tests\\": "tests/",
42+
"Workbench\\App\\": "workbench/app/"
43+
}
44+
},
3945
"repositories": {
4046
"tapp/filament-form-builder": {
4147
"type": "vcs",

database/.DS_Store

-6 KB
Binary file not shown.

0 commit comments

Comments
 (0)