Merge pull request #268 from BitBagCommerce/upgrade-to-20

Sylius 2.0 support

Author: senghe

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
       - 'dependabot/**'
   pull_request: ~
   release:
-    types: [ created ]
+    types: [created]
   schedule:
     - cron: "0 1 * * 6" # Run at 1am every Saturday
   workflow_dispatch: ~
@@ -20,11 +20,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ "8.1", "8.2", "8.3" ]
-        symfony: [ "^5.4", "^6.0" ]
-        sylius: [ "~1.13.0", "~1.14.0" ]
-        node: [ "18.x", "20.x" ]
-        mysql: [ "5.7", "8.0" ]
+        php: [ "8.2", "8.3" ]
+        symfony: [ "^7.1" ]
+        sylius: [ "^2.0" ]
+        node: [ "20.x" ]
+        mysql: [ "8.0" ]
     env:
       APP_ENV: test
       DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}"
@@ -76,7 +76,7 @@ jobs:
         run: google-chrome-stable --enable-automation --disable-background-networking --no-default-browser-check --no-first-run --disable-popup-blocking --disable-default-apps --allow-insecure-localhost --disable-translate --disable-extensions --no-sandbox --enable-features=Metal --headless --remote-debugging-port=9222 --window-size=2880,1800 --proxy-server='direct://' --proxy-bypass-list='*' http://127.0.0.1 > /dev/null 2>&1 &
 
       - 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
         id: composer-cache
@@ -104,9 +104,6 @@ jobs:
       - name: Install PHP dependencies
         run: composer install --no-interaction --no-scripts
 
-      - name: Install Behat driver
-        run: vendor/bin/bdi browser:google-chrome drivers
-
       - name: Get Yarn cache directory
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -150,13 +147,11 @@ jobs:
       - name: Run PHPUnit
         run: vendor/bin/phpunit --colors=always
 
-      - name: Run Behat
-        if: ${{ matrix.sylius != '^1.13.0' }}
-        run: vendor/bin/behat --colors --strict -vvv --no-interaction  --tags '~@sylius113' || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun --tags '~@sylius113'
+      - name: Create behat logs directory
+        run: (mkdir -p etc/build && chmod a+rw etc/build )
 
       - name: Run Behat
-        if: ${{ matrix.sylius == '^1.13.0' }}
-        run: vendor/bin/behat --colors --strict -vvv --no-interaction --tags '~@sylius112' || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun --tags '~@sylius112'
+        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@v4
@@ -165,6 +160,7 @@ jobs:
           name: Behat logs
           path: etc/build/
           if-no-files-found: ignore
+          overwrite: true
 
       - name: Run PHPUnit
         run: vendor/bin/phpunit --colors=always

.github/workflows/coding_standard.yml

@@ -18,10 +18,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ "8.1", "8.2", "8.3" ]
-        symfony: [ "^5.4", "^6.4" ]
-        sylius: [ "^1.12", "^1.13", "^1.14" ]
-        node: [ "18.x", "20.x" ]
+        php: [ "8.2", "8.3" ]
+        symfony: [ "^7.1" ]
+        sylius: [ "^2.0" ]
+        node: [ "20.x" ]
 
     steps:
       - uses: actions/checkout@v3

Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 ARG DEBIAN_FRONTEND=noninteractive
-ARG PHP_VERSION=8.1
+ARG PHP_VERSION=8.2
 ENV LC_ALL=C.UTF-8
 
 # Install basic tools
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y \
 # Append NODE, NGINX and PHP repositories
 RUN add-apt-repository ppa:ondrej/php \
     && add-apt-repository ppa:ondrej/nginx \
-    && curl -sL https://deb.nodesource.com/setup_14.x | bash -
+    && curl -sL https://deb.nodesource.com/setup_20.x | bash -
 
 # Install required PHP extensions
 RUN apt-get update && apt-get install -y \

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

@@ -1,2 +1,2 @@
 import './scss/main.scss'
-import './js/'
+import './js'

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

@@ -1,2 +1,2 @@
 import './scss/main.scss'
-import './js/'
+import './js'

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

@@ -8,7 +8,6 @@
     left: 50%;
     -webkit-transform: translateX(-50%);
     transform: translateX(-50%);
-    min-width: 100%;
     width: 600px;
     padding: 0 1rem 0 1rem;
     background-color: white;

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

@@ -0,0 +1,2 @@
+@import 'elasticSearchAutocomplete';
+

assets/shop/entrypoint.js

@@ -1,101 +1,99 @@
 {
-    "name": "bitbag/elasticsearch-plugin",
-    "type": "sylius-plugin",
-    "description": "BitBag Elasticsearch plugin for Sylius.",
-    "license": "MIT",
-    "require": {
-        "php": "^8.1",
-        "ext-json": "*",
-        "friendsofsymfony/elastica-bundle": "^6.0",
-        "sylius/sylius": "~1.13.0 || ~1.14.0",
-        "symfony/property-access": "^5.4 || ^6.0",
-        "symfony/webpack-encore-bundle": "^1.15",
-        "symfony/proxy-manager-bridge": "^5.4 || ^6.0"
-    },
-    "require-dev": {
-        "behat/behat": "^3.6.1",
-        "behat/mink-selenium2-driver": "^1.4",
-        "bitbag/coding-standard": "^v2.0",
-        "dbrekelmans/bdi": "^1.1",
-        "dmore/behat-chrome-extension": "^1.3",
-        "dmore/chrome-mink-driver": "^2.7",
-        "friends-of-behat/mink": "^1.8",
-        "friends-of-behat/mink-browserkit-driver": "^1.4",
-        "friends-of-behat/mink-debug-extension": "^2.0.0",
-        "friends-of-behat/mink-extension": "^2.4",
-        "friends-of-behat/page-object-extension": "^0.3",
-        "friends-of-behat/suite-settings-extension": "^1.0",
-        "friends-of-behat/symfony-extension": "^2.1",
-        "friends-of-behat/variadic-extension": "^1.3",
-        "league/flysystem-bundle": "2.4.0",
-        "lchrusciel/api-test-case": "^5.2",
-        "phpspec/phpspec": "^7.2",
-        "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "^1.8.1",
-        "phpstan/phpstan-doctrine": "1.3.69",
-        "phpstan/phpstan-strict-rules": "^1.3.0",
-        "phpstan/phpstan-webmozart-assert": "^1.2.0",
-        "phpunit/phpunit": "^9.0 || ^10.0",
-        "polishsymfonycommunity/symfony-mocker-container": "^1.0",
-        "robertfausk/behat-panther-extension": "^1.1",
-        "sylius-labs/coding-standard": "^4.2",
-        "sylius-labs/suite-tags-extension": "^0.2",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/debug-bundle": "^5.4 || ^6.0",
-        "symfony/dotenv": "^5.4 || ^6.0",
-        "symfony/intl": "^5.4 || ^6.0",
-        "symfony/web-profiler-bundle": "^5.4 || ^6.0"
-    },
-    "conflict": {
-        "api-platform/core": "v2.7.17",
-        "symfony/framework-bundle": "6.2.8",
-        "behat/mink-selenium2-driver": ">=1.7.0"
-    },
-    "config": {
-        "sort-packages": true,
-        "allow-plugins": {
-            "symfony/thanks": true,
-            "composer/package-versions-deprecated": true,
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "phpstan/extension-installer": true
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.13-dev"
-        },
-        "symfony": {
-            "require": "^5.4 || ^6.0"
-        }
-    },
-    "autoload": {
-        "psr-4": {
-            "BitBag\\SyliusElasticsearchPlugin\\": "src/",
-            "Tests\\BitBag\\SyliusElasticsearchPlugin\\Application\\": "tests/Application",
-            "Tests\\BitBag\\SyliusElasticsearchPlugin\\Integration\\": "tests/PHPUnit/Integration"
-        }
+  "name": "bitbag/elasticsearch-plugin",
+  "type": "sylius-plugin",
+  "description": "BitBag Elasticsearch plugin for Sylius.",
+  "license": "MIT",
+  "require": {
+    "php": "^8.2 || ^8.3",
+    "ext-json": "*",
+    "friendsofsymfony/elastica-bundle": "^6.0",
+    "sylius/sylius": "~2.0.0",
+    "symfony/property-access": "^7.1",
+    "symfony/webpack-encore-bundle": "^2.2"
+  },
+  "require-dev": {
+    "behat/behat": "^3.16",
+    "behat/mink-selenium2-driver": "~1.6.0",
+    "bitbag/coding-standard": "^v2.0",
+    "dbrekelmans/bdi": "^1.1",
+    "dmore/behat-chrome-extension": "^1.3",
+    "dmore/chrome-mink-driver": "^2.7",
+    "friends-of-behat/mink": "^1.11",
+    "friends-of-behat/mink-browserkit-driver": "^1.4",
+    "friends-of-behat/mink-debug-extension": "^2.0.0",
+    "friends-of-behat/mink-extension": "^2.4",
+    "friends-of-behat/page-object-extension": "^0.3",
+    "friends-of-behat/suite-settings-extension": "^1.0",
+    "friends-of-behat/symfony-extension": "^2.1",
+    "friends-of-behat/variadic-extension": "^1.3",
+    "lchrusciel/api-test-case": "^5.2",
+    "phpspec/phpspec": "^7.2",
+    "phpstan/extension-installer": "^1.0",
+    "phpstan/phpstan": "^1.8.1",
+    "phpstan/phpstan-doctrine": "1.3.69",
+    "phpstan/phpstan-strict-rules": "^1.3.0",
+    "phpstan/phpstan-webmozart-assert": "^1.2.0",
+    "phpunit/phpunit": "^10.5",
+    "polishsymfonycommunity/symfony-mocker-container": "^1.0",
+    "robertfausk/behat-panther-extension": "^1.1",
+    "sylius-labs/coding-standard": "^4.2",
+    "sylius-labs/suite-tags-extension": "^0.2",
+    "symfony/browser-kit": "^7.1",
+    "symfony/debug-bundle": "^7.1",
+    "symfony/dotenv": "7.1",
+    "symfony/intl": "^7.1",
+    "symfony/web-profiler-bundle": "^7.1"
+  },
+  "conflict": {
+    "api-platform/core": "v2.7.17",
+    "symfony/framework-bundle": "6.2.8"
+  },
+  "config": {
+    "sort-packages": true,
+    "allow-plugins": {
+      "composer/package-versions-deprecated": true,
+      "dealerdirect/phpcodesniffer-composer-installer": true,
+      "php-http/discovery": false,
+      "phpstan/extension-installer": true,
+      "symfony/thanks": true
+    }
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "1.13-dev"
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\BitBag\\SyliusElasticsearchPlugin\\Behat\\": "tests/Behat",
-            "spec\\BitBag\\SyliusElasticsearchPlugin\\": "spec/"
-        },
-        "classmap": ["tests/Application/Kernel.php"]
+    "symfony": {
+      "require": "^5.4 || ^6.0"
+    }
+  },
+  "autoload": {
+    "psr-4": {
+      "BitBag\\SyliusElasticsearchPlugin\\": "src/",
+      "Tests\\BitBag\\SyliusElasticsearchPlugin\\Application\\": "tests/Application",
+      "Tests\\BitBag\\SyliusElasticsearchPlugin\\Integration\\": "tests/PHPUnit/Integration"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\BitBag\\SyliusElasticsearchPlugin\\Behat\\": "tests/Behat",
+      "spec\\BitBag\\SyliusElasticsearchPlugin\\": "spec/"
     },
-    "scripts": {
-        "post-install-cmd": [
-            "php bin/create_node_symlink.php"
-        ],
-        "post-update-cmd": [
-            "php bin/create_node_symlink.php"
-        ],
-        "post-create-project-cmd": [
-            "php bin/create_node_symlink.php"
-        ],
-        "auto-scripts": {
-            "cache:clear": "symfony-cmd",
-            "assets:install %PUBLIC_DIR%": "symfony-cmd",
-            "security-checker security:check": "script"
-        }
+    "classmap": ["tests/Application/Kernel.php"]
+  },
+  "scripts": {
+    "post-install-cmd": [
+      "php bin/create_node_symlink.php"
+    ],
+    "post-update-cmd": [
+      "php bin/create_node_symlink.php"
+    ],
+    "post-create-project-cmd": [
+      "php bin/create_node_symlink.php"
+    ],
+    "auto-scripts": {
+      "cache:clear": "symfony-cmd",
+      "assets:install %PUBLIC_DIR%": "symfony-cmd",
+      "security-checker security:check": "script"
     }
+  }
 }

src/Resources/assets/shop/js/elasticSearchAutocomplete.js assets/shop/js/elasticSearchAutocomplete.js

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<resources xmlns="https://api-platform.com/schema/metadata/resources-3.0"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="https://api-platform.com/schema/metadata/resources-3.0 https://api-platform.com/schema/metadata/resources-3.0.xsd">
+    <resource class="%sylius.model.product.class%">
+        <operations>
+            <operation name="elasticsearch_shop_get"
+                       class="ApiPlatform\Metadata\GetCollection"
+                       uriTemplate="/shop/products/search"
+                       paginationEnabled="false"
+                       provider="bitbag_sylius_elasticsearch_plugin.api.data_provider.product_collection"
+                       openapi="true"
+            >
+                <normalizationContext>
+                    <values>
+                        <value name="groups">
+                            <values>
+                                <value>shop:product:index</value>
+                                <value>sylius:shop:product:index</value>
+                            </values>
+                        </value>
+                    </values>
+                </normalizationContext>
+            </operation>
+        </operations>
+    </resource>
+</resources>

src/Resources/assets/shop/js/elasticSearchCheckboxChangeSubmit.js assets/shop/js/elasticSearchCheckboxChangeSubmit.js

@@ -3,6 +3,7 @@ imports:
     - { resource: "indexes/bitbag_option_taxons.yml" }
     - { resource: "indexes/bitbag_attribute_taxons.yml" }
     - { resource: "indexes/bitbag_shop_facets.yml" }
+    - { resource: "twig/bitbag_twig_hooks.yml" }
 
 parameters:
     env(BITBAG_ES_INDEX_PREFIX): ""
@@ -28,10 +29,3 @@ fos_elastica:
 twig:
     globals:
         bitbag_es_pagination_available_page_limits: "%bitbag_es_pagination_available_page_limits%"
-
-sylius_ui:
-    events:
-        sylius.shop.layout.header.content:
-            blocks:
-                bitbag_es_search_form:
-                    template: "@BitBagSyliusElasticsearchPlugin/Shop/Menu/_searchForm.html.twig"

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

@@ -1,8 +1,8 @@
-bitbag_sylius_elasticsearch_plugin_shop_list_products:
-    path: /{_locale}/products-list/{slug}
+bitbag_sylius_elasticsearch_plugin_shop_taxon_products:
+    path: /{_locale}/taxons/{slug}
     defaults:
         _controller: bitbag_sylius_elasticsearch_plugin.controller.action.shop.taxon_products_search
-        template: "@BitBagSyliusElasticsearchPlugin/Shop/Product/index.html.twig"
+        template: "@BitBagSyliusElasticsearchPlugin/Shop/TaxonProductsSearch/index.html.twig"
     requirements:
         slug: .+
 
@@ -17,4 +17,4 @@ bitbag_sylius_elasticsearch_plugin_shop_search:
     path: /{_locale}/search
     defaults:
         _controller: bitbag_sylius_elasticsearch_plugin.controller.action.shop.site_wide_products_search
-        template: "@BitBagSyliusElasticsearchPlugin/Shop/search.html.twig"
+        template: "@BitBagSyliusElasticsearchPlugin/Shop/SiteWideSearch/index.html.twig"

src/Resources/assets/shop/js/initAutocomplete.js assets/shop/js/initAutocomplete.js

@@ -39,5 +39,10 @@
         <service id="bitbag.sylius_elasticsearch_plugin.repository.product_option_repository" class="BitBag\SyliusElasticsearchPlugin\Repository\ProductOptionRepository">
             <argument type="service" id="sylius.repository.product_option" />
         </service>
+
+        <service id="BitBag\SyliusElasticsearchPlugin\Api\OpenApi\Documentation\ProductSearchDocumentationModifier"
+                 decorates="api_platform.openapi.factory" public="true">
+            <argument type="service" id="BitBag\SyliusElasticsearchPlugin\Api\OpenApi\Documentation\ProductSearchDocumentationModifier.inner" />
+        </service>
     </services>
 </container>