Merge branch 'internal' into feature/pbc-1611/integrate-glue-checkout

spryker-shop · Jun 29, 2023 · bc77482 · bc77482
2 parents 9e4e115 + 310a743
commit bc77482
Show file tree

Hide file tree

Showing 69 changed files with 2,898 additions and 1,354 deletions.
diff --git a/.git.docker b/.git.docker
@@ -1 +1 @@
-a584e23c0b36d1d073bdc21b6bcf526bcf6dc992
+b5a63eac724e02fc4529b1b98dbf67e9d8b7c8ae
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -143,9 +143,6 @@ jobs:
             - name: Run PHPStan
               run: vendor/bin/phpstan analyze -l 5 -c phpstan.neon src/
 
-            - name: Run Security check
-              run: vendor/bin/console security:check
-
             - name: Run Evaluator
               run: vendor/bin/evaluator evaluate
 

diff --git a/codeception.functional.yml b/codeception.functional.yml
@@ -2,7 +2,8 @@ namespace: PyzTest
 actor: Tester
 
 include:
-    - tests/PyzTest/*/*
+    - tests/PyzTest/Zed/*
+    - tests/PyzTest/Yves/*
 
 paths:
     tests: tests

diff --git a/composer.json b/composer.json
@@ -47,7 +47,7 @@
         "spryker-feature/multiple-carts": "^202212.0",
         "spryker-feature/navigation": "^202212.0",
         "spryker-feature/non-splittable-products": "^202212.0",
-        "spryker-feature/order-management": "^202212.0",
+        "spryker-feature/order-management": "dev-master as 202304.0",
         "spryker-feature/packaging-units": "^202212.0",
         "spryker-feature/payments": "^202212.0",
         "spryker-feature/persistent-cart-sharing": "^202212.0",
@@ -60,7 +60,7 @@
         "spryker-feature/product-labels": "dev-master as 202304.0",
         "spryker-feature/product-lists": "dev-master as 202304.0",
         "spryker-feature/product-options": "^202212.0",
-        "spryker-feature/product-rating-reviews": "^202212.0",
+        "spryker-feature/product-rating-reviews": "dev-master as 202304.0",
         "spryker-feature/product-relations": "^202212.0",
         "spryker-feature/product-sets": "^202212.0",
         "spryker-feature/promotions-discounts": "dev-master as 202304.0",
@@ -86,11 +86,11 @@
         "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.1",
+        "spryker-shop/date-time-configurator-page-example": "^0.4.0",
         "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": "^1.5.1",
         "spryker/asset-storage": "^1.2.0",
         "spryker/auth-rest-api": "^2.14.1",
         "spryker/availability-cart-connector": "^7.3.0",
@@ -157,7 +157,7 @@
         "spryker/glue-backend-api-application-glue-json-api-convention-connector": "^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",
+        "spryker/message-broker": "^1.7.0",
         "spryker/message-broker-aws": "^1.4.0",
         "spryker/money-gui": "^1.0.0",
         "spryker/multi-carts-rest-api": "^1.0.0",
@@ -252,13 +252,15 @@
         "spryker-feature/development-tools": "dev-master as 202304.0",
         "spryker-sdk/benchmark": "^0.2.2",
         "spryker-sdk/composer-constrainer": "^0.2.6",
-        "spryker-sdk/evaluator": "dev-master",
+        "spryker-sdk/evaluator": "^0.1.0",
         "spryker-sdk/phpstan-spryker": "^0.4.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",
-        "spryker/testify": "^3.47.0",
+        "spryker/profiler": "^0.1.1",
+        "spryker/robotframework-suite-tests": "dev-master",
+        "spryker/testify": "^3.49.0",
         "stecman/symfony-console-completion": "*",
         "symfony/web-profiler-bundle": "*"
     },
@@ -301,6 +303,12 @@
             "spryker-sdk/integrator": false
         }
     },
+    "repositories": [
+        {
+            "type": "git",
+            "url": "https://github.com/spryker/robotframework-suite-tests.git"
+        }
+    ],
     "scripts": {
         "compile": [
             "mkdir -p ./data/DE/logs/ZED",