-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'janpalen/feature/OP-554-upgrade-to-syli…
…us-2.0' into merge-feature-upgrade
- Loading branch information
Showing
41 changed files
with
221 additions
and
356 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,21 +20,12 @@ jobs: | |
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| php: [ "8.0", "8.1", "8.2", "8.3" ] | ||
| symfony: [ "^5.4", "^6.4" ] | ||
| sylius: [ "~1.12.0", "~1.13.0", "~1.14.0" ] | ||
| node: [ "18.x", "20.x" ] | ||
| php: [ "8.2", "8.3" ] | ||
| symfony: [ "^7.1" ] | ||
| sylius: [ "^2.0" ] | ||
| node: [ "20.x" ] | ||
| mysql: [ "8.0" ] | ||
|
|
||
| exclude: | ||
| - sylius: "~1.14.0" | ||
| php: "8.0" | ||
| - sylius: "~1.13.0" | ||
| php: "8.0" | ||
| - sylius: "~1.12.0" | ||
| php: "8.0" | ||
| symfony: "^6.4" | ||
|
|
||
| env: | ||
| APP_ENV: test | ||
| DATABASE_URL: "mysql://root:[email protected]/sylius?serverVersion=${{ matrix.mysql }}" | ||
|
|
@@ -191,7 +182,7 @@ jobs: | |
|
|
||
| - | ||
| name: Upload Behat logs | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| if: failure() | ||
| with: | ||
| name: Behat logs | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,3 +21,5 @@ tests/Application/web/* | |
|
|
||
| /etc/build/* | ||
| !/etc/build/.gitkeep | ||
| .idea | ||
| package-lock.json | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| imports: | ||
| - { resource: "@BitBagSyliusCrossSellingPlugin/Resources/config/indexes/*" } | ||
| - { resource: "@BitBagSyliusCrossSellingPlugin/Resources/config/ui.yaml" } | ||
| - { resource: "@BitBagSyliusCrossSellingPlugin/Resources/config/twig_hooks.yaml" } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| sylius_twig_hooks: | ||
| hooks: | ||
| 'sylius_shop.product.show.content.product_listing': | ||
| related_products: | ||
| template: "@BitBagSyliusCrossSellingPlugin/Shop/Product/_relatedProducts.html.twig" | ||
| priority: 15 | ||
| associations: | ||
| template: '@SyliusShop/product/show/content/product_listing/associations.html.twig' | ||
| priority: 0 |
This file was deleted.
Oops, something went wrong.
20 changes: 13 additions & 7 deletions
20
src/Resources/views/Shop/Product/_relatedProducts.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,13 @@ | ||
| <h4 | ||
| class="ui horizontal section divider header" | ||
| {{ sylius_test_html_attribute('related-products-header') }} | ||
| > | ||
| {{ 'bitbag_sylius_crossselling_plugin.ui.related_products'|trans }} | ||
| </h4> | ||
| {{ bitbag_crossselling_render_related_products(product.slug, 4) }} | ||
| {% set product = hookable_metadata.context.product %} | ||
|
|
||
| <div class="container mb-6"> | ||
| <h2 | ||
| class="mb-5" | ||
| {{ sylius_test_html_attribute('related-products-header') }} | ||
| > | ||
| {{ 'bitbag_sylius_crossselling_plugin.ui.related_products'|trans }} | ||
| </h2> | ||
| <div> | ||
| {{ bitbag_crossselling_render_related_products(product.slug, 4) }} | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| import 'sylius/bundle/AdminBundle/Resources/private/entry'; | ||
| import 'sylius/bundle/AdminBundle/Resources/assets/entrypoint'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| import 'sylius/bundle/AdminBundle/Resources/assets/scripts/product/attribute-tabs-refresher'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "controllers": { | ||
| "@symfony/ux-autocomplete": { | ||
| "autocomplete": { | ||
| "main": "dist/controller.js", | ||
| "webpackMode": "eager", | ||
| "fetch": "eager", | ||
| "enabled": true, | ||
| "autoimport": { | ||
| "tom-select/dist/css/tom-select.default.css": false, | ||
| "tom-select/dist/css/tom-select.bootstrap5.css": false | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "entrypoints": [] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| import 'sylius/bundle/ShopBundle/Resources/private/entry'; | ||
| import 'sylius/bundle/ShopBundle/Resources/assets/entrypoint'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,12 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file has been created by developers from BitBag. | ||
| * Feel free to contact us once you face any issues or want to start | ||
| * You can find more information about us on https://bitbag.io and write us | ||
| * an email on [email protected]. | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| use Symfony\Component\Dotenv\Dotenv; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,12 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file has been created by developers from BitBag. | ||
| * Feel free to contact us once you face any issues or want to start | ||
| * You can find more information about us on https://bitbag.io and write us | ||
| * an email on [email protected]. | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| return [ | ||
|
|
@@ -30,19 +37,14 @@ | |
| Sylius\Bundle\CoreBundle\SyliusCoreBundle::class => ['all' => true], | ||
| Sylius\Bundle\ResourceBundle\SyliusResourceBundle::class => ['all' => true], | ||
| Sylius\Bundle\GridBundle\SyliusGridBundle::class => ['all' => true], | ||
| winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['all' => true], | ||
| Sonata\BlockBundle\SonataBlockBundle::class => ['all' => true], | ||
| Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle::class => ['all' => true], | ||
| JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true], | ||
| FOS\RestBundle\FOSRestBundle::class => ['all' => true], | ||
| Knp\Bundle\GaufretteBundle\KnpGaufretteBundle::class => ['all' => true], | ||
| Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true], | ||
| Liip\ImagineBundle\LiipImagineBundle::class => ['all' => true], | ||
| Payum\Bundle\PayumBundle\PayumBundle::class => ['all' => true], | ||
| // Payum\Bundle\PayumBundle\PayumBundle::class => ['all' => true], | ||
| Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true], | ||
| Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true], | ||
| Sylius\Bundle\FixturesBundle\SyliusFixturesBundle::class => ['all' => true], | ||
| Sylius\Bundle\PayumBundle\SyliusPayumBundle::class => ['all' => true], | ||
| // Sylius\Bundle\PayumBundle\SyliusPayumBundle::class => ['all' => true], | ||
| Sylius\Bundle\ThemeBundle\SyliusThemeBundle::class => ['all' => true], | ||
| Sylius\Bundle\AdminBundle\SyliusAdminBundle::class => ['all' => true], | ||
| Sylius\Bundle\ShopBundle\SyliusShopBundle::class => ['all' => true], | ||
|
|
@@ -51,14 +53,20 @@ | |
| Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true], | ||
| FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true, 'test_cached' => true], | ||
| Sylius\Behat\Application\SyliusTestPlugin\SyliusTestPlugin::class => ['test' => true, 'test_cached' => true], | ||
| ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true], | ||
| ApiPlatform\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true], | ||
| Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true], | ||
| Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true], | ||
| SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true], | ||
| FOS\ElasticaBundle\FOSElasticaBundle::class => ['all' => true], | ||
| Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true], | ||
| League\FlysystemBundle\FlysystemBundle::class =>['all' => true], | ||
| Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true], | ||
| SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true], | ||
| BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true], | ||
| Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class => ['all' => true], | ||
| Sylius\TwigHooks\SyliusTwigHooksBundle::class => ['all' => true], | ||
| Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true], | ||
| Symfony\UX\LiveComponent\LiveComponentBundle::class => ['all' => true], | ||
| Symfony\UX\Autocomplete\AutocompleteBundle::class => ['all' => true], | ||
| Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true], | ||
| Symfony\UX\Icons\UXIconsBundle::class => ['all' => true], | ||
| Sylius\TwigExtra\Symfony\SyliusTwigExtraBundle::class => ['all' => true], | ||
| ]; | ||
Oops, something went wrong.