Merge branch 'internal' of https://github.com/spryker-shop/b2b-demo-shop

into internal
spryker-community · May 29, 2023 · 4b97f59 · 4b97f59
2 parents b928f2d + 9940681
commit 4b97f59
Show file tree

Hide file tree

Showing 166 changed files with 9,359 additions and 5,528 deletions.
diff --git a/.git.docker b/.git.docker
@@ -1 +1 @@
-4c44379fd93b6505a86c2cd185b3bb5270afb1d6
+a584e23c0b36d1d073bdc21b6bcf526bcf6dc992
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -180,6 +180,34 @@ jobs:
                   docker/sdk testing codecept fixtures
                   docker/sdk testing console queue:worker:start --stop-when-empty
                   docker/sdk testing codecept run -c codeception.api.yml
+
+    php-81-postgresql-glue-alpine:
+        name: "PHP 8.1 / PostgreSQL / Glue / Alpine"
+        runs-on: ubuntu-20.04
+        env:
+            PROGRESS_TYPE: plain
+            SPRYKER_PLATFORM_IMAGE: spryker/php:8.1
+            TRAVIS: 1
+
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: Install apt-packages
+              run: |
+                  sudo apt-get install apache2-utils
+            - name: Install docker-compose
+              run: |
+                  sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+                  sudo chmod +x /usr/local/bin/docker-compose
+            - name: Run docker
+              run: |
+                  git clone https://github.com/spryker/docker-sdk.git ./docker
+                  docker/sdk boot deploy.ci.api.yml -v
+                  docker/sdk up -t -v
+                  docker/sdk testing codecept fixtures
+                  docker/sdk testing console queue:worker:start --stop-when-empty
+                  docker/sdk testing codecept run -c codeception.api.yml
+
     php-81-mariadb-acceptance-alpine:
         name: "PHP 8.1 / MariaDB / Acceptance / Alpine"
         runs-on: ubuntu-20.04
@@ -205,6 +233,33 @@ jobs:
                   docker/sdk up -t
                   docker/sdk testing console queue:worker:start --stop-when-empty
                   docker/sdk testing codecept run -c codeception.acceptance.yml
+
+    php-81-postgresql-acceptance-alpine:
+        name: "PHP 8.1 / PostgreSQL / Acceptance / Alpine"
+        runs-on: ubuntu-20.04
+        env:
+            PROGRESS_TYPE: plain
+            SPRYKER_PLATFORM_IMAGE: spryker/php:8.1
+            TRAVIS: 1
+
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: Install apt-packages
+              run: |
+                  sudo apt-get install apache2-utils
+            - name: Install docker-compose
+              run: |
+                  sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+                  sudo chmod +x /usr/local/bin/docker-compose
+            - name: Run docker
+              run: |
+                  git clone https://github.com/spryker/docker-sdk.git ./docker
+                  docker/sdk boot -v deploy.ci.acceptance.yml
+                  docker/sdk up -t
+                  docker/sdk testing console queue:worker:start --stop-when-empty
+                  docker/sdk testing codecept run -c codeception.acceptance.yml
+
     php-81-mariadb-functional-alpine:
         name: "PHP 8.1 / MariaDB / Functional / Alpine"
         runs-on: ubuntu-20.04
@@ -229,6 +284,33 @@ jobs:
                   docker/sdk boot deploy.ci.functional.mariadb.yml -v
                   docker/sdk up -t -v
                   docker/sdk testing codecept run -c codeception.functional.yml
+
+    php-81-postgresql-functional-alpine:
+        name: "PHP 8.1 / PostgreSQL / Functional / Alpine"
+        runs-on: ubuntu-20.04
+        env:
+            PROGRESS_TYPE: plain
+            SPRYKER_PLATFORM_IMAGE: spryker/php:8.1
+            TRAVIS: 1
+
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: Install apt-packages
+              run: |
+                  sudo apt-get install apache2-utils
+            - name: Install docker-compose
+              run: |
+                sudo curl -L "https://github.com/docker/compose/releases/download/2.12.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+                sudo chmod +x /usr/local/bin/docker-compose
+            - name: Run docker
+              run: |
+                  git clone https://github.com/spryker/docker-sdk.git ./docker
+                  docker/sdk boot -v deploy.ci.functional.yml
+                  docker/sdk up -t
+                  docker/sdk testing console queue:worker:start --stop-when-empty
+                  docker/sdk testing codecept run -c codeception.functional.yml
+
     php-80-mariadb-glue-alpine:
         name: "PHP 8.0 / MariaDB / Glue / Alpine"
         runs-on: ubuntu-20.04

diff --git a/codeception.functional.yml b/codeception.functional.yml
@@ -14,7 +14,7 @@ paths:
 settings:
     suite_class: \PHPUnit_Framework_TestSuite
     colors: true
-    memory_limit: 1536M
+    memory_limit: 2048M
     log: true
     lint: false
 

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "spryker-feature/alternative-products": "dev-master as 202304.0",
         "spryker-feature/approval-process": "^202212.0",
         "spryker-feature/availability-notification": "dev-master as 202304.0",
-        "spryker-feature/cart": "^202212.0",
+        "spryker-feature/cart": "dev-master as 202304.0",
         "spryker-feature/catalog": "^202212.0",
         "spryker-feature/category-management": "dev-master as 202304.0",
         "spryker-feature/checkout": "^202212.0",
@@ -51,10 +51,10 @@
         "spryker-feature/packaging-units": "^202212.0",
         "spryker-feature/payments": "^202212.0",
         "spryker-feature/persistent-cart-sharing": "^202212.0",
-        "spryker-feature/prices": "^202212.0",
+        "spryker-feature/prices": "dev-master as 202304.0",
         "spryker-feature/product": "dev-master as 202304.0",
         "spryker-feature/product-barcode": "^202212.0",
-        "spryker-feature/product-bundles": "^202212.0",
+        "spryker-feature/product-bundles": "dev-master as 202304.0",
         "spryker-feature/product-customer-restrictions": "^202212.0",
         "spryker-feature/product-groups": "^202212.0",
         "spryker-feature/product-labels": "dev-master as 202304.0",
@@ -76,7 +76,7 @@
         "spryker-feature/shared-carts": "^202212.0",
         "spryker-feature/shipment": "^202212.0",
         "spryker-feature/shopping-lists": "^202212.0",
-        "spryker-feature/spryker-core": "^202212.0",
+        "spryker-feature/spryker-core": "dev-master as 202304.0",
         "spryker-feature/spryker-core-back-office": "^202212.0",
         "spryker-feature/state-machine": "^202212.0",
         "spryker-feature/tax": "dev-master as 202304.0",
@@ -86,14 +86,13 @@
         "spryker-shop/cms-content-widget-chart-connector": "^1.0.3",
         "spryker-shop/cms-content-widget-product-connector": "^1.3.0",
         "spryker-shop/cms-content-widget-product-set-connector": "^1.3.1",
-        "spryker-shop/date-time-configurator-page-example": "^0.3.0",
+        "spryker-shop/date-time-configurator-page-example": "^0.3.1",
         "spryker/agent-auth-rest-api": "^1.0.0",
         "spryker/alternative-products-rest-api": "^1.1.2",
         "spryker/app-catalog-gui": "^1.2.0",
         "spryker/asset": "^1.4.0",
         "spryker/asset-storage": "^1.2.0",
         "spryker/auth-rest-api": "^2.14.1",
-        "spryker/authentication-extension": "^1.0.0",
         "spryker/availability-cart-connector": "^7.3.0",
         "spryker/availability-notifications-rest-api": "^1.2.0",
         "spryker/barcode-laminas": "^1.1.0",
@@ -102,7 +101,7 @@
         "spryker/cart-note-product-bundle-connector": "^1.0.3",
         "spryker/cart-permission-groups-rest-api": "^1.2.1",
         "spryker/carts-rest-api": "^5.22.0",
-        "spryker/catalog-price-product-connector": "^1.3.2",
+        "spryker/catalog-price-product-connector": "^1.4.0",
         "spryker/catalog-search-products-resource-relationship": "^1.2.0",
         "spryker/catalog-search-rest-api": "^2.7.0",
         "spryker/categories-rest-api": "^1.6.0",
@@ -149,15 +148,13 @@
         "spryker/customers-rest-api": "^1.21.2",
         "spryker/discount-calculation-connector": "^5.3.0",
         "spryker/discount-promotions-rest-api": "^1.4.1",
-        "spryker/documentation-generator-api-extension": "^1.0.0",
         "spryker/documentation-generator-rest-api": "^1.15.0",
         "spryker/entity-tags-rest-api": "^1.0.2",
         "spryker/flysystem": "^2.1.0",
         "spryker/flysystem-ftp-file-system": "^2.0.0",
         "spryker/flysystem-local-file-system": "^2.0.0",
         "spryker/glue-backend-api-application-authorization-connector": "^1.1.0",
         "spryker/glue-backend-api-application-glue-json-api-convention-connector": "^1.0.0",
-        "spryker/glue-json-api-convention-extension": "^1.0.0",
         "spryker/glue-storefront-api-application-authorization-connector": "^1.0.0",
         "spryker/glue-storefront-api-application-glue-json-api-convention-connector": "^1.0.0",
         "spryker/message-broker": "^1.4.0",
@@ -182,7 +179,7 @@
         "spryker/orders-rest-api": "^4.11.0",
         "spryker/payment-cart-connector": "^1.0.1",
         "spryker/payments-rest-api": "^1.1.1",
-        "spryker/price-cart-connector": "^6.8.0",
+        "spryker/price-cart-connector": "^6.9.0",
         "spryker/price-product-volumes-rest-api": "^1.1.0",
         "spryker/product-alternative-product-label-connector": "^1.1.1",
         "spryker/product-attributes-rest-api": "^1.0.0",
@@ -219,7 +216,7 @@
         "spryker/sales-returns-rest-api": "^1.1.0",
         "spryker/sales-statistics": "^1.2.0",
         "spryker/scheduler-jenkins": "^1.2.1",
-        "spryker/search-http": "^0.1.0",
+        "spryker/search-http": "^0.3.2",
         "spryker/secrets-manager": "^1.0.0",
         "spryker/secrets-manager-aws": "^1.0.1",
         "spryker/security-blocker-rest-api": "^1.0.0",
@@ -237,15 +234,15 @@
         "spryker/urls-rest-api": "^1.0.2",
         "spryker/util-number": "^1.0.0",
         "spryker/uuid": "^1.0.1",
-        "symfony/http-kernel": "^v5.4.20"
+        "symfony/http-kernel": "^6.0.0"
     },
     "require-dev": {
-        "codeception/codeception": "^5.0.2",
+        "codeception/codeception": "^5.0.8",
         "codeception/module-asserts": "^3.0.0",
         "codeception/module-cli": "^2.0.0",
         "codeception/module-filesystem": "^3.0.0",
         "codeception/module-phpbrowser": "^3.0.0",
-        "codeception/module-rest": "^3.1.0",
+        "codeception/module-rest": "^3.3.2",
         "codeception/module-webdriver": "^3.1.1",
         "composer/package-versions-deprecated": "^1.10.0",
         "dms/phpunit-arraysubset-asserts": "^0.4.0",
@@ -255,9 +252,9 @@
         "spryker-feature/development-tools": "dev-master as 202304.0",
         "spryker-sdk/benchmark": "^0.2.2",
         "spryker-sdk/composer-constrainer": "^0.2.6",
-        "spryker-sdk/integrator": "dev-master",
+        "spryker-sdk/evaluator": "dev-master",
         "spryker-sdk/phpstan-spryker": "^0.4.0",
-        "spryker-sdk/security-checker": "^0.1.0",
+        "spryker-sdk/security-checker": "^0.2.0",
         "spryker/architecture-sniffer": "^0.5.5",
         "spryker/code-sniffer": "^0.17.18",
         "spryker/docker-chromedriver": "dev-master",
@@ -291,15 +288,14 @@
         },
         "use-include-path": true,
         "sort-packages": true,
-        "github-protocols": [
-            "https"
-        ],
+        "github-protocols": ["https"],
         "process-timeout": 900,
         "chromium-revision": 814168,
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "spryker-sdk/integrator": true,
-            "sllh/composer-versions-check": true
+            "sllh/composer-versions-check": true,
+            "symfony/flex": true,
+            "symfony/runtime": true
         }
     },
     "scripts": {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		4c44379fd93b6505a86c2cd185b3bb5270afb1d6
		a584e23c0b36d1d073bdc21b6bcf526bcf6dc992