Skip to content

Commit 2152be7

Browse files
repl6669repl6669
authored
Merge pull request #34 from dystcz/feat/update-to-lunar-beta-16
Feat: Update to lunar beta 16 with Laravel 12 support
2 parents 93bd87f + 30a3f60 commit 2152be7

File tree

10 files changed

+165
-167
lines changed

10 files changed

+165
-167
lines changed

‎.github/workflows/static-analysis.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
php: [8.2, 8.3]
16-
laravel: [11]
15+
php: [8.2, 8.3, 8.4]
16+
laravel: [11, 12]
1717

1818
name: "PHP ${{ matrix.php }} - L${{ matrix.laravel }}"
1919
runs-on: "ubuntu-latest"

‎.github/workflows/tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
php: [8.2, 8.3]
14-
laravel: [11.*]
13+
php: [8.2, 8.3, 8.4]
14+
laravel: [11, 12]
1515
testsuite:
1616
- api
1717
- newsletter

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"php": "^8.2",
2424
"ext-redis": "*",
2525
"h4kuna/ares": "^3.0",
26-
"illuminate/support": "^11.0",
26+
"illuminate/support": "^11.0|^12.0",
2727
"laravel-json-api/laravel": "^5.0",
2828
"laravel-json-api/non-eloquent": "^4.0",
2929
"laravel-notification-channels/discord": "^1.5",
30-
"lunarphp/lunar": "1.0.0-beta.10",
30+
"lunarphp/lunar": "1.0.0-beta.16",
3131
"lunarphp/stripe": "^1.0.0",
3232
"spatie/laravel-newsletter": "^5.1",
3333
"spatie/laravel-stripe-webhooks": "^3.6",

‎packages/api/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
],
2121
"require": {
2222
"php": "^8.2",
23-
"illuminate/support": "^11.0",
23+
"illuminate/support": "^11.0|^12.0",
2424
"laravel-json-api/laravel": "^5.0",
2525
"laravel-json-api/non-eloquent": "^4.0",
26-
"lunarphp/lunar": "^1.0.0-beta.9",
26+
"lunarphp/lunar": "1.0.0-beta.16",
2727
"staudenmeir/eloquent-has-many-deep": "^1.20"
2828
},
2929
"autoload": {

‎packages/newsletter/composer.json‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
{
2-
"name": "dystcz/dystore-newsletter",
3-
"description": "Add the possibility to sign up to newsletter lists to your Dystore backend",
4-
"keywords": [
5-
"dystopia",
6-
"dystore",
7-
"lunar",
8-
"newsletter"
9-
],
10-
"homepage": "https://github.com/dystcz/dystore",
11-
"license": "MIT",
12-
"type": "library",
13-
"authors": [
14-
{
15-
"name": "Dystopia",
16-
"homepage": "https://dy.st/"
17-
}
18-
],
19-
"require": {
20-
"php": "^8.2",
21-
"dystcz/dystore-api": "^1.1",
22-
"illuminate/support": "^11.0",
23-
"spatie/laravel-newsletter": "^5.1"
2+
"name": "dystcz/dystore-newsletter",
3+
"description": "Add the possibility to sign up to newsletter lists to your Dystore backend",
4+
"keywords": [
5+
"dystopia",
6+
"dystore",
7+
"lunar",
8+
"newsletter"
9+
],
10+
"homepage": "https://github.com/dystcz/dystore",
11+
"license": "MIT",
12+
"type": "library",
13+
"authors": [
14+
{
15+
"name": "Dystopia",
16+
"homepage": "https://dy.st/"
17+
}
18+
],
19+
"require": {
20+
"php": "^8.2",
21+
"dystcz/dystore-api": "^1.0.0",
22+
"illuminate/support": "^11.0|^12.0",
23+
"spatie/laravel-newsletter": "^5.1"
24+
},
25+
"suggest": {
26+
"spatie/mailcoach-sdk-php": "For working with Mailcoach",
27+
"drewm/mailchimp-api": "For working with MailChimp",
28+
"getbrevo/brevo-php": "For working with Brevo"
29+
},
30+
"require-dev": {
31+
"drewm/mailchimp-api": "^2.5",
32+
"getbrevo/brevo-php": "^1.0",
33+
"spatie/mailcoach-sdk-php": "^1.1"
34+
},
35+
"autoload": {
36+
"psr-4": {
37+
"Dystore\\Newsletter\\": "src",
38+
"Dystore\\Newsletter\\Database\\Factories\\": "database/factories",
39+
"Dystore\\Newsletter\\Database\\State\\": "database/state"
2440
},
25-
"suggest": {
26-
"spatie/mailcoach-sdk-php": "For working with Mailcoach",
27-
"drewm/mailchimp-api": "For working with MailChimp",
28-
"getbrevo/brevo-php": "For working with Brevo"
29-
},
30-
"require-dev": {
31-
"drewm/mailchimp-api": "^2.5",
32-
"getbrevo/brevo-php": "^1.0",
33-
"spatie/mailcoach-sdk-php": "^1.1"
34-
},
35-
"autoload": {
36-
"psr-4": {
37-
"Dystore\\Newsletter\\": "src",
38-
"Dystore\\Newsletter\\Database\\Factories\\": "database/factories",
39-
"Dystore\\Newsletter\\Database\\State\\": "database/state"
40-
},
41-
"files": [
42-
"autoload.php"
43-
]
44-
},
45-
"config": {
46-
"sort-packages": true,
47-
"allow-plugins": {
48-
"pestphp/pest-plugin": true
49-
}
50-
},
51-
"extra": {
52-
"laravel": {
53-
"providers": [
54-
"Dystore\\Newsletter\\NewsletterServiceProvider"
55-
]
56-
}
57-
},
58-
"minimum-stability": "dev",
59-
"prefer-stable": true
41+
"files": [
42+
"autoload.php"
43+
]
44+
},
45+
"config": {
46+
"sort-packages": true,
47+
"allow-plugins": {
48+
"pestphp/pest-plugin": true
49+
}
50+
},
51+
"extra": {
52+
"laravel": {
53+
"providers": [
54+
"Dystore\\Newsletter\\NewsletterServiceProvider"
55+
]
56+
}
57+
},
58+
"minimum-stability": "dev",
59+
"prefer-stable": true
6060
}

‎packages/product-notifications/composer.json‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
{
2-
"name": "dystcz/dystore-product-notifications",
3-
"description": "Dystore product notifications",
4-
"keywords": [
5-
"dystopia",
6-
"lunar",
7-
"dystore",
8-
"laravel",
9-
"php"
10-
],
11-
"homepage": "https://github.com/dystcz/dystore",
12-
"license": "MIT",
13-
"type": "library",
14-
"authors": [
15-
{
16-
"name": "Dystopia",
17-
"homepage": "https://dy.st/"
18-
}
19-
],
20-
"require": {
21-
"php": "^8.2",
22-
"dystcz/dystore-api": "^1.1",
23-
"illuminate/support": "^11.0"
2+
"name": "dystcz/dystore-product-notifications",
3+
"description": "Dystore product notifications",
4+
"keywords": [
5+
"dystopia",
6+
"lunar",
7+
"dystore",
8+
"laravel",
9+
"php"
10+
],
11+
"homepage": "https://github.com/dystcz/dystore",
12+
"license": "MIT",
13+
"type": "library",
14+
"authors": [
15+
{
16+
"name": "Dystopia",
17+
"homepage": "https://dy.st/"
18+
}
19+
],
20+
"require": {
21+
"php": "^8.2",
22+
"dystcz/dystore-api": "^1.0.0",
23+
"illuminate/support": "^11.0|^12.0"
24+
},
25+
"autoload": {
26+
"psr-4": {
27+
"Dystore\\ProductNotifications\\": "src",
28+
"Dystore\\ProductNotifications\\Database\\Factories\\": "database/factories",
29+
"Dystore\\ProductNotifications\\Database\\State\\": "database/state"
2430
},
25-
"autoload": {
26-
"psr-4": {
27-
"Dystore\\ProductNotifications\\": "src",
28-
"Dystore\\ProductNotifications\\Database\\Factories\\": "database/factories",
29-
"Dystore\\ProductNotifications\\Database\\State\\": "database/state"
30-
},
31-
"files": [
32-
"autoload.php"
33-
]
34-
},
35-
"config": {
36-
"sort-packages": true,
37-
"allow-plugins": {
38-
"pestphp/pest-plugin": true
39-
}
40-
},
41-
"extra": {
42-
"laravel": {
43-
"providers": [
44-
"Dystore\\ProductNotifications\\ProductNotificationsServiceProvider"
45-
]
46-
}
47-
},
48-
"minimum-stability": "dev",
49-
"prefer-stable": true
31+
"files": [
32+
"autoload.php"
33+
]
34+
},
35+
"config": {
36+
"sort-packages": true,
37+
"allow-plugins": {
38+
"pestphp/pest-plugin": true
39+
}
40+
},
41+
"extra": {
42+
"laravel": {
43+
"providers": [
44+
"Dystore\\ProductNotifications\\ProductNotificationsServiceProvider"
45+
]
46+
}
47+
},
48+
"minimum-stability": "dev",
49+
"prefer-stable": true
5050
}

‎packages/product-views/composer.json‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
{
2-
"name": "dystcz/dystore-product-views",
3-
"description": "Track product views in yout Dystore backend",
4-
"keywords": [
5-
"dystopia",
6-
"lunar",
7-
"dystore",
8-
"laravel",
9-
"php"
10-
],
11-
"homepage": "https://github.com/dystcz/dystore",
12-
"license": "MIT",
13-
"type": "library",
14-
"authors": [
15-
{
16-
"name": "Dystopia",
17-
"homepage": "https://dy.st/"
18-
}
19-
],
20-
"require": {
21-
"php": "^8.2",
22-
"dystcz/dystore-api": "^1.1",
23-
"illuminate/support": "^11.0",
24-
"ext-redis": "*"
2+
"name": "dystcz/dystore-product-views",
3+
"description": "Track product views in yout Dystore backend",
4+
"keywords": [
5+
"dystopia",
6+
"lunar",
7+
"dystore",
8+
"laravel",
9+
"php"
10+
],
11+
"homepage": "https://github.com/dystcz/dystore",
12+
"license": "MIT",
13+
"type": "library",
14+
"authors": [
15+
{
16+
"name": "Dystopia",
17+
"homepage": "https://dy.st/"
18+
}
19+
],
20+
"require": {
21+
"php": "^8.2",
22+
"dystcz/dystore-api": "^1.0.0",
23+
"illuminate/support": "^11.0|^12.0",
24+
"ext-redis": "*"
25+
},
26+
"autoload": {
27+
"psr-4": {
28+
"Dystore\\ProductViews\\": "src",
29+
"Dystore\\ProductViews\\Database\\Factories\\": "database/factories",
30+
"Dystore\\ProductViews\\Database\\State\\": "database/state"
2531
},
26-
"autoload": {
27-
"psr-4": {
28-
"Dystore\\ProductViews\\": "src",
29-
"Dystore\\ProductViews\\Database\\Factories\\": "database/factories",
30-
"Dystore\\ProductViews\\Database\\State\\": "database/state"
31-
},
32-
"files": [
33-
"autoload.php"
34-
]
35-
},
36-
"config": {
37-
"sort-packages": true,
38-
"allow-plugins": {
39-
"pestphp/pest-plugin": true
40-
}
41-
},
42-
"extra": {
43-
"laravel": {
44-
"providers": [
45-
"Dystore\\ProductViews\\ProductViewsServiceProvider"
46-
]
47-
}
48-
},
49-
"minimum-stability": "dev",
50-
"prefer-stable": true
32+
"files": [
33+
"autoload.php"
34+
]
35+
},
36+
"config": {
37+
"sort-packages": true,
38+
"allow-plugins": {
39+
"pestphp/pest-plugin": true
40+
}
41+
},
42+
"extra": {
43+
"laravel": {
44+
"providers": [
45+
"Dystore\\ProductViews\\ProductViewsServiceProvider"
46+
]
47+
}
48+
},
49+
"minimum-stability": "dev",
50+
"prefer-stable": true
5151
}

‎packages/reviews/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
],
2020
"require": {
2121
"php": "^8.2",
22-
"dystcz/dystore-api": "^1.1",
23-
"illuminate/support": "^11.0"
22+
"dystcz/dystore-api": "^1.0.0",
23+
"illuminate/support": "^11.0|^12.0"
2424
},
2525
"autoload": {
2626
"psr-4": {

‎packages/stripe/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
],
2121
"require": {
2222
"php": "^8.2",
23-
"illuminate/support": "^11.0",
24-
"dystcz/dystore-api": "^1.1",
23+
"illuminate/support": "^11.0|^12.0",
24+
"dystcz/dystore-api": "^1.0.0",
2525
"lunarphp/stripe": "^1.0.0",
2626
"spatie/laravel-stripe-webhooks": "^3.6"
2727
},

‎tests/api/Feature/Domain/Products/JsonApi/V1/ProductMostExpensiveVariantRelationshipTest.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@
4444
/** @var Currency $currency */
4545
$currency = Currency::getDefault();
4646

47-
$mostExpensiveVariant = $product->variants->sortBy(
48-
fn ($variant) => $variant->prices->sortByDesc('price')->first()->price,
49-
)->first();
47+
$mostExpensiveVariant = $product->variants->sortByDesc(fn ($variant) => $variant->prices->max('price'))->first();
5048

5149
$highestPrice = $mostExpensiveVariant->prices->first()->price;
5250

0 commit comments

Comments
 (0)