Merge pull request #49 from spryker-shop/release-202212.0-p1

Release 202212.0 p1
spryker-shop · Jan 25, 2023 · f4a3b61 · f4a3b61
2 parents bff5d9d + c1d5e19
commit f4a3b61
Show file tree

Hide file tree

Showing 531 changed files with 2,132 additions and 1,753 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ on:
 jobs:
     validation:
         name: "Static analysis / PHP 8.0"
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         strategy:
             fail-fast: false
             matrix:
@@ -45,7 +45,7 @@ jobs:
             - name: Runs Elasticsearch
               uses: elastic/elastic-github-actions/elasticsearch@master
               with:
-                  stack-version: 7.6.0
+                  stack-version: 7.10.0
                   port: 10005
 
             - uses: actions/setup-node@v1
@@ -119,7 +119,7 @@ jobs:
 
             - name: Install NPM packages
               run: |
-                  sudo npm install -g --unsafe-perm [email protected]
+                  sudo npm i --location=global --unsafe-perm [email protected]
 
             - name: Speccy lint Glue specification
               run: speccy lint src/Generated/Glue/Specification/spryker_rest_api.schema.yml --rules=default
@@ -158,7 +158,7 @@ jobs:
 
     php-80-mariadb-glue-alpine:
         name: "PHP 8.0 / MariaDB / Glue / Alpine"
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         env:
             PROGRESS_TYPE: plain
             SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
@@ -173,7 +173,7 @@ jobs:
 
             - name: Install docker-compose
               run: |
-                  sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+                  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
@@ -187,7 +187,7 @@ jobs:
 
     php-80-postgresql-acceptance-alpine:
         name: "PHP 8.0 / PostgreSQL / Acceptance / Alpine"
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         env:
             PROGRESS_TYPE: plain
             SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
@@ -202,7 +202,7 @@ jobs:
 
             - name: Install docker-compose
               run: |
-                  sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+                  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
@@ -216,7 +216,7 @@ jobs:
 
     php-80-postgresql-functional-alpine:
         name: "PHP 8.0 / PostgreSQL / Functional / Alpine"
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         env:
             PROGRESS_TYPE: plain
             SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
@@ -231,7 +231,7 @@ jobs:
 
             - name: Install docker-compose
               run: |
-                  sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+                  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
@@ -244,7 +244,7 @@ jobs:
 
     php-80-mariadb-acceptance-alpine:
         name: "PHP 8.0 / MariaDB / Acceptance / Alpine"
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         env:
             PROGRESS_TYPE: plain
             SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
@@ -259,7 +259,7 @@ jobs:
 
             - name: Install docker-compose
               run: |
-                  sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+                  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
@@ -273,7 +273,7 @@ jobs:
 
     php-80-mariadb-functional-alpine:
         name: "PHP 8.0 / MariaDB / Functional / Alpine"
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         env:
             PROGRESS_TYPE: plain
             SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
@@ -288,7 +288,7 @@ jobs:
 
             - name: Install docker-compose
               run: |
-                  sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+                  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
@@ -301,7 +301,7 @@ jobs:
 
     php-80-postgres-functional-debian:
         name: "PHP 8.0 / PostgreSQL / Functional / Debian"
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         env:
             PROGRESS_TYPE: plain
             SPRYKER_PLATFORM_IMAGE: spryker/php:8.0-debian
@@ -316,7 +316,7 @@ jobs:
 
             - name: Install docker-compose
               run: |
-                  sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+                  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
@@ -328,15 +328,15 @@ jobs:
 
     frontend-assets-via-docker-php-8-0:
         name: "Docker / Alpine / PHP 8.0 / Frontend & Assets"
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         env:
             PROGRESS_TYPE: plain
             SPRYKER_PLATFORM_IMAGE: spryker/php:8.0
         steps:
             - uses: actions/checkout@v2
             - run: echo eyAiZXhwZXJpbWVudGFsIiA6IHRydWUsICJmZWF0dXJlcyIgOiB7ICJidWlsZGtpdCI6IHRydWUgfSB9Cg==|base64 -d|sudo tee /etc/docker/daemon.json
             - run: sudo apt-get install --only-upgrade docker -y
-            - run: sudo curl -L "https://github.com/docker/compose/releases/download/1.24.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/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
             - run: sudo chmod +x /usr/local/bin/docker-compose
             - run: git clone https://github.com/spryker/docker-sdk.git --single-branch --branch master ./docker
             - run: docker/sdk boot deploy.yml

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,8 @@
 # IDEs
-/.idea
-/.project
-/nbproject
+.idea/
+.project/
+.vscode/
+nbproject/
 /.buildpath
 /.settings
 *.sublime-*

diff --git a/.stylelintignore b/.stylelintignore
@@ -1,4 +1,5 @@
 # Ignore paths
 **/node_modules/**
+**/DateTimeConfiguratorPageExample/**
 **/dist/**
-/public/*/assets/
+public/*/assets/**
diff --git a/codeception.acceptance.yml b/codeception.acceptance.yml
@@ -11,7 +11,6 @@ paths:
     support: tests/_support
     envs: tests/_envs
 
-bootstrap: _bootstrap.php
 settings:
     suite_class: \PHPUnit_Framework_TestSuite
     colors: true

diff --git a/codeception.api.yml b/codeception.api.yml
@@ -11,7 +11,6 @@ paths:
     support: tests/_support
     envs: tests/_envs
 
-bootstrap: _bootstrap.php
 settings:
     suite_class: \PHPUnit_Framework_TestSuite
     colors: true

diff --git a/codeception.ci.functional.yml b/codeception.ci.functional.yml
@@ -11,7 +11,6 @@ paths:
     support: tests/_support
     envs: tests/_envs
 
-bootstrap: _bootstrap.php
 settings:
     suite_class: \PHPUnit_Framework_TestSuite
     colors: true

diff --git a/codeception.functional.yml b/codeception.functional.yml
@@ -11,7 +11,6 @@ paths:
     support: tests/_support
     envs: tests/_envs
 
-bootstrap: _bootstrap.php
 settings:
     suite_class: \PHPUnit_Framework_TestSuite
     colors: true

diff --git a/codeception.yml b/codeception.yml
@@ -11,7 +11,6 @@ paths:
     support: tests/_support
     envs: tests/_envs
 
-bootstrap: _bootstrap.php
 settings:
     colors: true
     memory_limit: 1024M

diff --git a/composer.json b/composer.json
@@ -289,7 +289,7 @@
         "spryker-sdk/phpstan-spryker": "^0.4.0",
         "spryker-sdk/security-checker": "^0.1.0",
         "spryker/architecture-sniffer": "^0.5.5",
-        "spryker/code-sniffer": "^0.16.6",
+        "spryker/code-sniffer": "^0.17.18",
         "spryker/docker-chromedriver": "dev-master",
         "spryker/testify": "^3.47.0",
         "stecman/symfony-console-completion": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/config/Shared/common/config_oms-development.php b/config/Shared/common/config_oms-development.php
@@ -36,5 +36,5 @@
     [
         DummyMarketplacePaymentConfig::PAYMENT_METHOD_DUMMY_MARKETPLACE_PAYMENT_INVOICE => 'MarketplacePayment01',
         NopaymentConfig::PAYMENT_PROVIDER_NAME => 'Nopayment01',
-    ]
+    ],
 );
diff --git a/config/Shared/config_default-ci.php b/config/Shared/config_default-ci.php
@@ -16,9 +16,9 @@
 use Spryker\Shared\Kernel\Store;
 use Spryker\Shared\Log\LogConstants;
 use Spryker\Shared\Mail\MailConstants;
+use Spryker\Shared\MerchantPortalApplication\MerchantPortalConstants;
 use Spryker\Shared\MessageBroker\MessageBrokerConstants;
 use Spryker\Shared\MessageBrokerAws\MessageBrokerAwsConstants;
-use Spryker\Shared\MerchantPortalApplication\MerchantPortalConstants;
 use Spryker\Shared\Newsletter\NewsletterConstants;
 use Spryker\Shared\OauthClient\OauthClientConstants;
 use Spryker\Shared\Product\ProductConstants;
@@ -210,11 +210,11 @@
 
 $config[ZedRequestConstants::BASE_URL_ZED_API] = sprintf(
     'http://%s',
-    $backendGatewayHost
+    $backendGatewayHost,
 );
 $config[ZedRequestConstants::BASE_URL_SSL_ZED_API] = sprintf(
     'https://%s',
-    $backendGatewayHost
+    $backendGatewayHost,
 );
 
 // ----------------------------------------------------------------------------
@@ -223,7 +223,7 @@
 
 $config[ApplicationConstants::BASE_URL_ZED] = sprintf(
     'http://%s',
-    $backofficeHost
+    $backofficeHost,
 );
 
 // ----------------------------------------------------------------------------
@@ -250,7 +250,7 @@
     = $config[NewsletterConstants::BASE_URL_YVES]
     = sprintf(
         'http://%s',
-        $yvesHost
+        $yvesHost,
     );
 
 // ----------------------------------------------------------------------------
@@ -260,7 +260,7 @@
 $config[GlueApplicationConstants::GLUE_APPLICATION_DOMAIN]
     = sprintf(
         'http://%s',
-        $glueHost
+        $glueHost,
     );
 
 if (class_exists(TestifyConstants::class)) {

diff --git a/config/Shared/config_default-development.php b/config/Shared/config_default-development.php
@@ -167,11 +167,11 @@
 
 $config[ZedRequestConstants::BASE_URL_ZED_API] = sprintf(
     'http://%s',
-    $backendGatewayHost
+    $backendGatewayHost,
 );
 $config[ZedRequestConstants::BASE_URL_SSL_ZED_API] = sprintf(
     'https://%s',
-    $backendGatewayHost
+    $backendGatewayHost,
 );
 
 // ----------------------------------------------------------------------------
@@ -180,7 +180,7 @@
 
 $config[ApplicationConstants::BASE_URL_ZED] = sprintf(
     'http://%s',
-    $backofficeHost
+    $backofficeHost,
 );
 
 // ----------------------------------------------------------------------------
@@ -207,7 +207,7 @@
     = $config[NewsletterConstants::BASE_URL_YVES]
     = sprintf(
         'http://%s',
-        $yvesHost
+        $yvesHost,
     );
 
 // ----------------------------------------------------------------------------
@@ -217,7 +217,7 @@
 $config[GlueApplicationConstants::GLUE_APPLICATION_DOMAIN]
     = sprintf(
         'http://%s',
-        $glueHost
+        $glueHost,
     );
 
 if (class_exists(TestifyConstants::class)) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,5 +36,5 @@ @@
         [
             DummyMarketplacePaymentConfig::PAYMENT_METHOD_DUMMY_MARKETPLACE_PAYMENT_INVOICE => 'MarketplacePayment01',
             NopaymentConfig::PAYMENT_PROVIDER_NAME => 'Nopayment01',
-        ]
+        ],
     );