OP-550 - Change structures of the directories to current Symfony recommendations

Author: JanPalen

.github/workflows/build.yml

@@ -75,7 +75,7 @@ jobs:
 
       -
         name: Run webserver
-        run: (cd tests/Application && symfony server:start --port=8080 --dir=public --daemon)
+        run: (cd tests/Application && symfony server:start --port=8080 --dir=public --daemon && symfony -V)
 
       -
         name: Get Composer cache directory
@@ -160,21 +160,22 @@ jobs:
         run: vendor/bin/phpunit --colors=always
 
       -
-        name: Cache clear
-        run: (cd tests/Application && rm -rf var/cache)
+        name: Create behat logs directory
+        run: (mkdir -p etc/build && chmod a+rw etc/build )
 
       -
         name: Run Behat
         run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun
 
       -
         name: Upload Behat logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: Behat logs
           path: etc/build/
           if-no-files-found: ignore
+          overwrite: true
 
       -
         name: Failed build Slack notification

src/Resources/assets/admin/entry.js assets/admin/entry.js

@@ -6,7 +6,7 @@
     "license": "MIT",
     "require": {
         "php": "~8.2.0 || ~8.3.0",
-        "sylius/sylius": "~2.0.0",
+        "sylius/sylius": "^2.0.0",
         "dompdf/dompdf": "^2.0",
         "sylius/twig-hooks": "^0.5",
         "sylius/twig-extra": "^0.5",

src/Resources/assets/admin/js/index.js assets/admin/js/index.js

@@ -0,0 +1,9 @@
+imports:
+  - { resource: resources.yml }
+  - { resource: services.xml }
+  - { resource: "@BitBagSyliusProductBundlePlugin/config/twig_hooks/twig_hooks.yaml" }
+
+framework:
+  messenger:
+    buses:
+      bitbag_sylius_product_bundle.command_bus: ~

src/Resources/assets/admin/scss/main.scss assets/admin/scss/main.scss

@@ -0,0 +1,4 @@
+imports:
+  - { resource: resources/product_bundle.yml }
+  - { resource: resources/product_bundle_item.yml }
+  - { resource: resources/product_bundle_order_item.yml }

src/Resources/assets/shop/entry.js assets/shop/entry.js

@@ -0,0 +1,10 @@
+bitbag_sylius_product_bundle_admin:
+  resource: routes/admin.yml
+  prefix: '/%sylius_admin.path_name%'
+
+bitbag_sylius_product_bundle_shop:
+  resource: routes/shop.yml
+  prefix: /{_locale}
+  requirements:
+    _locale: ^[a-z]{2}(?:_[A-Z]{2})?$
+

src/Resources/assets/shop/js/index.js assets/shop/js/index.js

@@ -0,0 +1,3 @@
+imports:
+  - { resource: "@BitBagSyliusProductBundlePlugin/config/twig_hooks/product/**/*.yaml" }
+  - { resource: "@BitBagSyliusProductBundlePlugin/config/twig_hooks/order/*.yaml" }

src/Resources/assets/shop/scss/main.scss assets/shop/scss/main.scss

@@ -20,6 +20,11 @@ final class BitBagSyliusProductBundlePlugin extends Bundle
 {
     use SyliusPluginTrait;
 
+    public function getPath(): string
+    {
+        return \dirname(__DIR__);
+    }
+
     public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new AuthenticationManagerPolyfillPass());

composer.json

@@ -1,4 +1,4 @@
-{% form_theme form '@SyliusShop/Form/theme.html.twig' %}
+{% form_theme form '@SyliusShop/form/theme.html.twig' %}
 
 {% if product.isBundle %}
     {% set product_bundle_items = form.productBundleItems %}

src/Resources/config/api_resources/admin/ProductBundle.xml config/api_resources/admin/ProductBundle.xml

@@ -1,2 +1,2 @@
 imports:
-    - { resource: "@BitBagSyliusProductBundlePlugin/Resources/config/config.yml" }
+    - { resource: "@BitBagSyliusProductBundlePlugin/config/config.yml" }

src/Resources/config/api_resources/shop/Order.xml config/api_resources/shop/Order.xml

@@ -1,2 +1,2 @@
 bitbag_sylius_product_bundle_plugin:
-    resource: "@BitBagSyliusProductBundlePlugin/Resources/config/routing.yml"
+    resource: "@BitBagSyliusProductBundlePlugin/config/routes.yml"

src/Resources/config/api_resources/shop/Product.xml config/api_resources/shop/Product.xml

@@ -8,7 +8,7 @@ const getConfig = (pluginName, type) => {
     Encore
         .setOutputPath(`public/build/bitbag/${pluginName}/${type}/`)
         .setPublicPath(`/build/bitbag/${pluginName}/${type}/`)
-        .addEntry(`bitbag-${pluginName}-${type}`, path.resolve(__dirname, `./src/Resources/assets/${type}/entry.js`))
+        .addEntry(`bitbag-${pluginName}-${type}`, path.resolve(__dirname, `./assets/${type}/entry.js`))
         .disableSingleRuntimeChunk()
         .cleanupOutputBeforeBuild()
         .enableSourceMaps(!Encore.isProduction())
@@ -23,8 +23,8 @@ const getConfig = (pluginName, type) => {
 Encore
     .setOutputPath(`src/Resources/public/`)
     .setPublicPath(`/public/`)
-    .addEntry(`bitbag-${pluginName}-shop`, path.resolve(__dirname, `./src/Resources/assets/shop/entry.js`))
-    .addEntry(`bitbag-${pluginName}-admin`, path.resolve(__dirname, `./src/Resources/assets/admin/entry.js`))
+    .addEntry(`bitbag-${pluginName}-shop`, path.resolve(__dirname, `./assets/shop/entry.js`))
+    .addEntry(`bitbag-${pluginName}-admin`, path.resolve(__dirname, `./assets/admin/entry.js`))
     .cleanupOutputBeforeBuild()
     .disableSingleRuntimeChunk()
     .enableSassLoader();