Skip to content

Commit 6aa8071

Browse files
Cholin2000Cholin2000
committed
2.0-upgrade fixes after code review
1 parent 8b80aad commit 6aa8071

File tree

3 files changed

+207
-207
lines changed

3 files changed

+207
-207
lines changed

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"description": "BitBag Elasticsearch plugin for Sylius.",
55
"license": "MIT",
66
"require": {
7-
"php": "^8.2",
7+
"php": "^8.2 || ^8.3",
88
"ext-json": "*",
99
"friendsofsymfony/elastica-bundle": "^6.0",
1010
"sylius/sylius": "~2.0.0",
1111
"symfony/property-access": "^6.4 || ^7.1",
12-
"symfony/proxy-manager-bridge": "^6.4 || ^7.1",
12+
"symfony/proxy-manager-bridge": "^7.1",
1313
"symfony/webpack-encore-bundle": "^2.2"
1414
},
1515
"require-dev": {

‎config/config.yml

Lines changed: 1 addition & 205 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ imports:
33
- { resource: "indexes/bitbag_option_taxons.yml" }
44
- { resource: "indexes/bitbag_attribute_taxons.yml" }
55
- { resource: "indexes/bitbag_shop_facets.yml" }
6+
- { resource: "twig/bitbag_twig_hooks.yml" }
67

78
parameters:
89
env(BITBAG_ES_INDEX_PREFIX): ""
@@ -28,208 +29,3 @@ fos_elastica:
2829
twig:
2930
globals:
3031
bitbag_es_pagination_available_page_limits: "%bitbag_es_pagination_available_page_limits%"
31-
32-
sylius_twig_hooks:
33-
hooks:
34-
'sylius_shop.base.header.content':
35-
search_form:
36-
template: "@BitBagSyliusElasticsearchPlugin/Shop/Layout/Header/searchForm.html.twig"
37-
priority: 250
38-
'sylius_shop.base.header.content.search_form':
39-
content:
40-
component: 'bitbag.sylius_elasticsearch_plugin:search_form'
41-
props:
42-
template: "@BitBagSyliusElasticsearchPlugin/Shop/SearchForm/searchForm.html.twig"
43-
priority: 0
44-
45-
'bitbag.sylius_elasticsearch_plugin.site_wide_search.index':
46-
content:
47-
template: '@SyliusShop/product/index/content.html.twig'
48-
priority: 0
49-
'bitbag.sylius_elasticsearch_plugin.site_wide_search.index.content':
50-
breadcrumbs:
51-
template: "@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/content/breadcrumbs.html.twig"
52-
priority: 100
53-
body:
54-
template: '@SyliusShop/product/index/content/body.html.twig'
55-
priority: 0
56-
'bitbag.sylius_elasticsearch_plugin.site_wide_search.index.content.body':
57-
sidebar:
58-
template: '@SyliusShop/product/index/content/body/sidebar.html.twig'
59-
priority: 100
60-
main:
61-
template: '@SyliusShop/product/index/content/body/main.html.twig'
62-
priority: 0
63-
'bitbag.sylius_elasticsearch_plugin.site_wide_search.index.content.body.sidebar':
64-
facets:
65-
template: '@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/content/body/sidebar/facets.html.twig'
66-
priority: 0
67-
'bitbag.sylius_elasticsearch_plugin.site_wide_search.index.content.body.main':
68-
filters:
69-
template: '@SyliusShop/product/index/content/body/main/filters.html.twig'
70-
priority: 200
71-
products:
72-
template: '@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/content/body/main/products.html.twig'
73-
priority: 100
74-
pagination:
75-
template: '@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/content/body/main/pagination.html.twig'
76-
priority: 0
77-
'bitbag.sylius_elasticsearch_plugin.site_wide_search.index.content.body.main.filters':
78-
controls:
79-
template: '@SyliusShop/product/index/content/body/main/filters/controls.html.twig'
80-
priority: 0
81-
'bitbag.sylius_elasticsearch_plugin.site_wide_search.index.content.body.main.filters.controls':
82-
limit:
83-
template: '@SyliusShop/product/index/content/body/main/filters/controls/limit.html.twig'
84-
priority: 100
85-
sorting:
86-
template: '@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/content/body/main/sorting.html.twig'
87-
priority: 0
88-
'bitbag.sylius_elasticsearch_plugin.site_wide_search.index.content.body.main.filters.controls.limit':
89-
toggle:
90-
template: '@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/content/body/main/limit/toggle.html.twig'
91-
priority: 100
92-
menu:
93-
template: '@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/content/body/main/limit/menu.html.twig'
94-
priority: 0
95-
'bitbag.sylius_elasticsearch_plugin.site_wide_search.index.content.body.main.filters.controls.sorting':
96-
toggle:
97-
template: '@SyliusShop/product/index/content/body/main/filters/controls/sorting/toggle.html.twig'
98-
priority: 100
99-
menu:
100-
template: '@SyliusShop/product/index/content/body/main/filters/controls/sorting/menu.html.twig'
101-
priority: 0
102-
'bitbag.sylius_elasticsearch_plugin.site_wide_search.index.content.body.main.filters.controls.sorting.menu':
103-
bestsellers:
104-
template: '@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/content/body/main/sorting/item.html.twig'
105-
configuration:
106-
title: 'bitbag_sylius_elasticsearch_plugin.ui.bestsellers'
107-
order_by: 'sold_units'
108-
sort: 'desc'
109-
priority: 600
110-
newest:
111-
template: '@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/content/body/main/sorting/item.html.twig'
112-
configuration:
113-
title: 'bitbag_sylius_elasticsearch_plugin.ui.newest'
114-
order_by: 'product_created_at'
115-
sort: 'desc'
116-
priority: 500
117-
oldest:
118-
template: '@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/content/body/main/sorting/item.html.twig'
119-
configuration:
120-
title: 'bitbag_sylius_elasticsearch_plugin.ui.oldest'
121-
order_by: 'product_created_at'
122-
sort: 'asc'
123-
priority: 400
124-
most_expensive:
125-
template: '@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/content/body/main/sorting/item.html.twig'
126-
configuration:
127-
title: 'bitbag_sylius_elasticsearch_plugin.ui.most_expensive'
128-
order_by: 'price'
129-
sort: 'desc'
130-
priority: 300
131-
cheapest:
132-
template: '@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/content/body/main/sorting/item.html.twig'
133-
configuration:
134-
title: 'bitbag_sylius_elasticsearch_plugin.ui.cheapest'
135-
order_by: 'price'
136-
sort: 'asc'
137-
priority: 200
138-
139-
'bitbag.sylius_elasticsearch_plugin.taxon_products_search.index':
140-
content:
141-
template: '@SyliusShop/product/index/content.html.twig'
142-
priority: 0
143-
'bitbag.sylius_elasticsearch_plugin.taxon_products_search.index.content':
144-
breadcrumbs:
145-
template: "@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/breadcrumbs.html.twig"
146-
priority: 100
147-
body:
148-
template: '@SyliusShop/product/index/content/body.html.twig'
149-
priority: 0
150-
'bitbag.sylius_elasticsearch_plugin.taxon_products_search.index.content.body':
151-
sidebar:
152-
template: '@SyliusShop/product/index/content/body/sidebar.html.twig'
153-
priority: 100
154-
main:
155-
template: '@SyliusShop/product/index/content/body/main.html.twig'
156-
priority: 0
157-
'bitbag.sylius_elasticsearch_plugin.taxon_products_search.index.content.body.sidebar':
158-
facets:
159-
template: '@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/body/sidebar/facets.html.twig'
160-
priority: 0
161-
'bitbag.sylius_elasticsearch_plugin.taxon_products_search.index.content.body.main':
162-
filters:
163-
template: '@SyliusShop/product/index/content/body/main/filters.html.twig'
164-
priority: 200
165-
search:
166-
template: '@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/body/main/search.html.twig'
167-
priority: 150
168-
products:
169-
template: '@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/body/main/products.html.twig'
170-
priority: 100
171-
pagination:
172-
template: '@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/body/main/pagination.html.twig'
173-
priority: 0
174-
175-
'bitbag.sylius_elasticsearch_plugin.taxon_products_search.index.content.body.main.filters':
176-
controls:
177-
template: '@SyliusShop/product/index/content/body/main/filters/controls.html.twig'
178-
priority: 0
179-
'bitbag.sylius_elasticsearch_plugin.taxon_products_search.index.content.body.main.filters.controls':
180-
limit:
181-
template: '@SyliusShop/product/index/content/body/main/filters/controls/limit.html.twig'
182-
priority: 100
183-
sorting:
184-
template: '@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/body/main/sorting.html.twig'
185-
priority: 0
186-
'bitbag.sylius_elasticsearch_plugin.taxon_products_search.index.content.body.main.filters.controls.limit':
187-
toggle:
188-
template: '@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/body/main/limit/toggle.html.twig'
189-
priority: 100
190-
menu:
191-
template: '@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/body/main/limit/menu.html.twig'
192-
priority: 0
193-
'bitbag.sylius_elasticsearch_plugin.taxon_products_search.index.content.body.main.filters.controls.sorting':
194-
toggle:
195-
template: '@SyliusShop/product/index/content/body/main/filters/controls/sorting/toggle.html.twig'
196-
priority: 100
197-
menu:
198-
template: '@SyliusShop/product/index/content/body/main/filters/controls/sorting/menu.html.twig'
199-
priority: 0
200-
'bitbag.sylius_elasticsearch_plugin.taxon_products_search.index.content.body.main.filters.controls.sorting.menu':
201-
bestsellers:
202-
template: '@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/body/main/sorting/item.html.twig'
203-
configuration:
204-
title: 'bitbag_sylius_elasticsearch_plugin.ui.bestsellers'
205-
order_by: 'sold_units'
206-
sort: 'desc'
207-
priority: 600
208-
newest:
209-
template: '@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/body/main/sorting/item.html.twig'
210-
configuration:
211-
title: 'bitbag_sylius_elasticsearch_plugin.ui.newest'
212-
order_by: 'product_created_at'
213-
sort: 'desc'
214-
priority: 500
215-
oldest:
216-
template: '@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/body/main/sorting/item.html.twig'
217-
configuration:
218-
title: 'bitbag_sylius_elasticsearch_plugin.ui.oldest'
219-
order_by: 'product_created_at'
220-
sort: 'asc'
221-
priority: 400
222-
most_expensive:
223-
template: '@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/body/main/sorting/item.html.twig'
224-
configuration:
225-
title: 'bitbag_sylius_elasticsearch_plugin.ui.most_expensive'
226-
order_by: 'price'
227-
sort: 'desc'
228-
priority: 300
229-
cheapest:
230-
template: '@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/content/body/main/sorting/item.html.twig'
231-
configuration:
232-
title: 'bitbag_sylius_elasticsearch_plugin.ui.cheapest'
233-
order_by: 'price'
234-
sort: 'asc'
235-
priority: 200

0 commit comments

Comments
 (0)