Skip to content

Commit 4e25fdf

Browse files
deemonicclaude
andcommitted
merge: resolve composer.json conflict with main (Laravel 13 compat)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2 parents a67ccd8 + f24d341 commit 4e25fdf

1 file changed

Lines changed: 52 additions & 52 deletions

File tree

composer.json

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
{
2-
"name": "blaspsoft/blasp",
3-
"description": "Blasp is a powerful and customisable profanity filter package for Laravel applications",
4-
"keywords": [
5-
"blaspsoft",
6-
"blasp"
7-
],
8-
"homepage": "https://github.com/blaspsoft/blasp",
9-
"license": "MIT",
10-
"type": "library",
11-
"authors": [
12-
{
13-
"name": "Michael Deeming",
14-
"email": "michael.deeming90@gmail.com",
15-
"role": "Developer"
2+
"name": "blaspsoft/blasp",
3+
"description": "Blasp is a powerful and customisable profanity filter package for Laravel applications",
4+
"keywords": [
5+
"blaspsoft",
6+
"blasp"
7+
],
8+
"homepage": "https://github.com/blaspsoft/blasp",
9+
"license": "MIT",
10+
"type": "library",
11+
"authors": [
12+
{
13+
"name": "Michael Deeming",
14+
"email": "michael.deeming90@gmail.com",
15+
"role": "Developer"
16+
}
17+
],
18+
"require": {
19+
"php": "^8.2",
20+
"illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0|^13.0"
21+
},
22+
"require-dev": {
23+
"orchestra/testbench": "^10.0|^11.0",
24+
"phpunit/phpunit": "^11.0|^12.5.12"
25+
},
26+
"autoload": {
27+
"psr-4": {
28+
"Blaspsoft\\Blasp\\": "src/"
29+
}
30+
},
31+
"autoload-dev": {
32+
"psr-4": {
33+
"Blaspsoft\\Blasp\\Tests\\": "tests"
34+
}
35+
},
36+
"minimum-stability": "stable",
37+
"prefer-stable": true,
38+
"scripts": {
39+
"test": "vendor/bin/phpunit",
40+
"test-coverage": "vendor/bin/phpunit --coverage-html coverage"
41+
},
42+
"config": {
43+
"sort-packages": true
44+
},
45+
"extra": {
46+
"laravel": {
47+
"providers": [
48+
"Blaspsoft\\Blasp\\BlaspServiceProvider"
49+
],
50+
"aliases": {
51+
"Blasp": "Blaspsoft\\Blasp\\Facades\\Blasp"
52+
}
53+
}
1654
}
17-
],
18-
"require": {
19-
"php": "^8.2",
20-
"illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0"
21-
},
22-
"require-dev": {
23-
"orchestra/testbench": "^10.0",
24-
"phpunit/phpunit": "^11.0"
25-
},
26-
"autoload": {
27-
"psr-4": {
28-
"Blaspsoft\\Blasp\\": "src/"
29-
}
30-
},
31-
"autoload-dev": {
32-
"psr-4": {
33-
"Blaspsoft\\Blasp\\Tests\\": "tests"
34-
}
35-
},
36-
"minimum-stability": "stable",
37-
"prefer-stable": true,
38-
"scripts": {
39-
"test": "vendor/bin/phpunit",
40-
"test-coverage": "vendor/bin/phpunit --coverage-html coverage"
41-
},
42-
"config": {
43-
"sort-packages": true
44-
},
45-
"extra": {
46-
"laravel": {
47-
"providers": [
48-
"Blaspsoft\\Blasp\\BlaspServiceProvider"
49-
],
50-
"aliases": {
51-
"Blasp": "Blaspsoft\\Blasp\\Facades\\Blasp"
52-
}
53-
}
54-
}
5555
}

0 commit comments

Comments
 (0)