Skip to content

Commit 49e3de4

Browse files
Jade-GGJade-GG
authored
Merge branch 'master' into feature/super-attributes-fix
2 parents e53bf60 + ab69ce7 commit 49e3de4

File tree

6 files changed

+31
-35
lines changed

6 files changed

+31
-35
lines changed

‎.github/workflows/analyse.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ jobs:
1616
php: [8.2, 8.3, 8.4]
1717
stability: [prefer-stable]
1818
include:
19-
- laravel: 11.*
20-
testbench: 9.*
2119
- laravel: 12.*
2220
testbench: 10.*
2321

‎.github/workflows/phpunit.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
php: [8.2, 8.3, 8.4]
19-
laravel: [11.*, 12.*]
19+
laravel: [12.*]
2020
stability: [prefer-lowest, prefer-stable]
2121
include:
22-
- laravel: 11.*
23-
testbench: ~9.2
2422
- laravel: 12.*
2523
testbench: 10.*
2624

‎composer.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"blade-ui-kit/blade-heroicons": "^2.6",
2121
"blade-ui-kit/blade-icons": "^1.8",
2222
"http-interop/http-factory-guzzle": "^1.2",
23-
"illuminate/database": "^11.0|^12.0",
24-
"illuminate/events": "^11.0|^12.0",
25-
"illuminate/queue": "^11.0|^12.0",
26-
"illuminate/support": "^11.0|^12.0, <12.26.0 || >=12.27.0",
23+
"illuminate/database": "^12.0",
24+
"illuminate/events": "^12.0",
25+
"illuminate/queue": "^12.0",
26+
"illuminate/support": "^12.0, <12.26.0 || >=12.27.0",
2727
"justbetter/laravel-http3earlyhints": "^1.4",
2828
"laravel/scout": "^10.14",
2929
"lcobucci/clock": "^2.0|^3.2",
@@ -36,7 +36,7 @@
3636
},
3737
"require-dev": {
3838
"larastan/larastan": "^3.1",
39-
"orchestra/testbench": "^9.4|^10.0",
39+
"orchestra/testbench": "^10.0",
4040
"phpunit/phpunit": "^11.3.5"
4141
},
4242
"autoload": {
@@ -70,6 +70,7 @@
7070
}
7171
},
7272
"conflict": {
73+
"laravel/framework": "<12.11",
7374
"rapidez/reviews": "<4.1"
7475
},
7576
"scripts": {

‎config/rapidez/models.php‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,25 @@
3030
'product_option_type_title' => Rapidez\Core\Models\ProductOptionTypeTitle::class,
3131
'product_option_type_value' => Rapidez\Core\Models\ProductOptionTypeValue::class,
3232
'product_price' => Rapidez\Core\Models\ProductPrice::class,
33-
// TODO: the naming is mixed..
34-
'product_review' => Rapidez\Core\Models\Review::class,
35-
'product_review_summary' => Rapidez\Core\Models\ProductReviewSummary::class,
36-
'product_stock' => Rapidez\Core\Models\ProductStock::class,
37-
'product_super_link' => Rapidez\Core\Models\ProductSuperLink::class,
38-
'product_tier_price' => Rapidez\Core\Models\ProductTierPrice::class,
39-
'product_view' => Rapidez\Core\Models\ProductView::class,
40-
'quote' => Rapidez\Core\Models\Quote::class,
41-
'quote_id_mask' => Rapidez\Core\Models\QuoteIdMask::class,
42-
'quote_item' => Rapidez\Core\Models\QuoteItem::class,
43-
'quote_item_option' => Rapidez\Core\Models\QuoteItemOption::class,
44-
'report_event' => Rapidez\Core\Models\ReportEvent::class,
45-
'rewrite' => Rapidez\Core\Models\Rewrite::class,
46-
'sales_order' => Rapidez\Core\Models\SalesOrder::class,
47-
'sales_order_address' => Rapidez\Core\Models\SalesOrderAddress::class,
48-
'sales_order_item' => Rapidez\Core\Models\SalesOrderItem::class,
49-
'sales_order_payment' => Rapidez\Core\Models\SalesOrderPayment::class,
50-
'search_query' => Rapidez\Core\Models\SearchQuery::class,
51-
'search_synonym' => Rapidez\Core\Models\SearchSynonym::class,
52-
'store' => Rapidez\Core\Models\Store::class,
53-
'super_attribute' => Rapidez\Core\Models\SuperAttribute::class,
54-
'widget' => Rapidez\Core\Models\Widget::class,
33+
'product_stock' => Rapidez\Core\Models\ProductStock::class,
34+
'product_super_link' => Rapidez\Core\Models\ProductSuperLink::class,
35+
'product_tier_price' => Rapidez\Core\Models\ProductTierPrice::class,
36+
'product_view' => Rapidez\Core\Models\ProductView::class,
37+
'quote' => Rapidez\Core\Models\Quote::class,
38+
'quote_id_mask' => Rapidez\Core\Models\QuoteIdMask::class,
39+
'quote_item' => Rapidez\Core\Models\QuoteItem::class,
40+
'quote_item_option' => Rapidez\Core\Models\QuoteItemOption::class,
41+
'report_event' => Rapidez\Core\Models\ReportEvent::class,
42+
'review' => Rapidez\Core\Models\Review::class,
43+
'review_summary' => Rapidez\Core\Models\ReviewSummary::class,
44+
'rewrite' => Rapidez\Core\Models\Rewrite::class,
45+
'sales_order' => Rapidez\Core\Models\SalesOrder::class,
46+
'sales_order_address' => Rapidez\Core\Models\SalesOrderAddress::class,
47+
'sales_order_item' => Rapidez\Core\Models\SalesOrderItem::class,
48+
'sales_order_payment' => Rapidez\Core\Models\SalesOrderPayment::class,
49+
'search_query' => Rapidez\Core\Models\SearchQuery::class,
50+
'search_synonym' => Rapidez\Core\Models\SearchSynonym::class,
51+
'store' => Rapidez\Core\Models\Store::class,
52+
'super_attribute' => Rapidez\Core\Models\SuperAttribute::class,
53+
'widget' => Rapidez\Core\Models\Widget::class,
5554
];

‎src/Models/Product.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,15 @@ public function options(): HasMany
197197
public function reviewSummary(): HasOne
198198
{
199199
return $this->hasOne(
200-
config('rapidez.models.product_review_summary'),
200+
config('rapidez.models.review_summary', ReviewSummary::class),
201201
'entity_pk_value'
202202
);
203203
}
204204

205205
public function reviews(): BelongsToMany
206206
{
207207
return $this->belongsToMany(
208-
config('rapidez.models.product_review', Review::class), 'review',
208+
config('rapidez.models.review', Review::class), 'review',
209209
'entity_pk_value', 'review_id',
210210
'entity_id', 'review_id',
211211
)->where('review.entity_id', Review::REVIEW_ENTITY_PRODUCT);

src/Models/ProductReviewSummary.php renamed to src/Models/ReviewSummary.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Illuminate\Database\Eloquent\Builder;
66
use Illuminate\Database\Eloquent\Relations\BelongsTo;
77

8-
class ProductReviewSummary extends Model
8+
class ReviewSummary extends Model
99
{
1010
protected $table = 'review_entity_summary';
1111

0 commit comments

Comments
 (0)