Support Spryker 202009 release

.gitignore

@@ -2,3 +2,4 @@
 /github-changelog-http-cache/
 /tests/
 /tmp-test/
+.idea

Jenkinsfile

@@ -116,6 +116,10 @@ pipeline {
                             steps { sh './test wordpress static' }
                         }
                         stage('Spryker Static') {
+                            environment {
+                                SPRYKER_OAUTH_CLIENT_SECRET = credentials('spryker-oauth-client-secret')
+                                SPRYKER_ZED_REQUEST_TOKEN = credentials('spryker-zed-request-token')
+                            }
                             steps { sh './test spryker static' }
                         }
                         stage('Wordpress Dynamic') {

src/_base/harness/config/commands.yml

@@ -308,3 +308,22 @@ command('harness update fresh'):
     ws disable || true
     rm -rf .my127ws
     ws install
+
+command('generate token <length>'):
+  env:
+    LENGTH: = input.argument('length')
+  exec: |
+    #!php
+    $ascii_codes = range(48, 57) + range(97, 122) + range(65, 90);
+    $codes_length = (count($ascii_codes)-1);
+    shuffle($ascii_codes);
+    $string = '';
+    for($i = 1; $i <= $env['LENGTH']; $i++) {
+        $previous_char = $char ?? '';
+        $char = chr($ascii_codes[random_int(0, $codes_length)]);
+        while($char == $previous_char){
+            $char = chr($ascii_codes[random_int(0, $codes_length)]);
+        }
+        $string .= $char;
+    }
+    echo $string;

src/spryker/README.md

@@ -26,4 +26,7 @@ attribute('app.services'):
   - jenkins-runner
 ``` 
 
+To generate and encrypt secrets for pipeline environments: 
+https://github.com/inviqa/k8s-project-cluster/blob/0.1.x-dev/docs/cluster-management/sealed-secrets/README.md
+
 [Workspace]: https://github.com/my127/workspace

src/spryker/application/overlay/phpstan-baseline.neon

@@ -0,0 +1,51 @@
+parameters:
+    ignoreErrors:
+        -
+            message: "#^Parameter \\#2 \\$value of method Elastica\\\\Query\\\\Term\\:\\:setTerm\\(\\) expects array|string, int given\\.$#"
+            count: 1
+            path: src/Pyz/Client/ExampleProductSalePage/Plugin/Elasticsearch/Query/SaleSearchQueryPlugin.php
+
+        -
+            message: "#^Parameter \\#2 \\$default of method Symfony\\\\Component\\\\HttpFoundation\\\\InputBag\\:\\:get\\(\\) expects string|null, array given\\.$#"
+            count: 1
+            path: src/Pyz/Yves/ProductSetWidget/Widget/ProductSetIdsWidget.php
+
+        -
+            message: "#^Parameter \\#1 \\$input of function array_filter expects array, string given\\.$#"
+            count: 1
+            path: src/Pyz/Yves/ProductSetWidget/Widget/ProductSetIdsWidget.php
+
+        -
+            message: "#^Parameter \\#1 \\$exampleStateMachineItems of method Pyz\\\\Zed\\\\ExampleStateMachine\\\\Business\\\\Model\\\\ExampleStateMachineItemReader\\:\\:hydrateTransferFromPersistence\\(\\) expects#"
+            count: 2
+            path: src/Pyz/Zed/ExampleStateMachine/Business/Model/ExampleStateMachineItemReader.php
+
+        -
+            message: "#^Parameter \\#1 \\$command of class Symfony\\\\Component\\\\Process\\\\Process constructor expects array, string given\\.$#"
+            count: 2
+            path: src/Pyz/Zed/Log/Communication/Plugin/FilebeatLogListenerPlugin.php
+
+        -
+            message: "#^Parameter \\#1 \\$productFacade of class Pyz\\\\Zed\\\\ProductUrlCartConnector\\\\Business\\\\Expander\\\\ProductUrlExpander constructor expects Spryker\\\\Zed\\\\Product\\\\Business\\\\ProductFacadeInterface, Spryker\\\\Zed\\\\ProductRelation\\\\Business\\\\ProductRelationFacadeInterface given\\.$#"
+            count: 1
+            path: src/Pyz/Zed/ProductUrlCartConnector/Business/ProductUrlCartConnectorBusinessFactory.php
+
+        -
+            message: "#^Parameter \\#2 \\$serverUniqueId of method Spryker\\\\Zed\\\\Queue\\\\Business\\\\Process\\\\ProcessManager\\:\\:__construct\\(\\) expects string, int given\\.$#"
+            count: 1
+            path: src/Pyz/Zed/Queue/Business/Process/ProcessManager.php
+
+        -
+            message: "#^Parameter \\#2 \\$serverUniqueId of class Pyz\\\\Zed\\\\Queue\\\\Business\\\\Process\\\\ProcessManager constructor expects int, string given\\.$#"
+            count: 1
+            path: src/Pyz/Zed/Queue/Business/QueueBusinessFactory.php
+
+        -
+            message: "#^Parameter \\#3 \\$queueConfig of class Pyz\\\\Zed\\\\Queue\\\\Business\\\\Process\\\\ProcessManager constructor expects Pyz\\\\Zed\\\\Queue\\\\QueueConfig, Spryker\\\\Zed\\\\Queue\\\\QueueConfig given\\.$#"
+            count: 1
+            path: src/Pyz/Zed/Queue/Business/QueueBusinessFactory.php
+
+        -
+            message: "#^Parameter \\#2 \\$entityId of method Spryker\\\\Zed\\\\DataImport\\\\Business\\\\Model\\\\DataImportStep\\\\PublishAwareStep\\:\\:addPublishEvents\\(\\) expects int, Orm\\\\Zed\\\\Product\\\\Persistence\\\\SpyProductAbstract given\\.$#"
+            count: 1
+            path: src/Pyz/Zed/DataImport/Business/Model/ProductOption/ProductOptionWriterStep.php

src/spryker/application/overlay/phpstan.neon

@@ -1,12 +1,11 @@
 includes:
+    - phpstan-baseline.neon
     - vendor/spryker-sdk/phpstan-spryker/extension.neon
 
 parameters:
     excludes_analyse:
         - %rootDir%/../../../src/Generated/*
         - %rootDir%/../../../src/Orm/*
-        # ignoring following dir temporarily due to errors in core
-        - %rootDir%/../../../src/Pyz/Zed/DataImport/Business/Model/*
 
     bootstrap: %rootDir%/../../../phpstan-bootstrap.php
 

src/spryker/application/skeleton/behat.yml

@@ -1,8 +1,8 @@
 default:
   suites:
     sample:
-      contexts_services:
-        - yves.plp.context
+      contexts:
+        - Acceptance\Context\Yves\ProductListPageContext
   extensions:
     Behat\MinkExtension:
       default_session: goutte
@@ -23,10 +23,6 @@ default:
       namespaces:
         page: [Acceptance\Page]
         element: [Acceptance\Element]
-    FriendsOfBehat\ContextServiceExtension:
-      imports:
-        - 'features/bootstrap/_config/contexts.yml'
-    FriendsOfBehat\CrossContainerExtension: ~
     Cjm\Behat\StepThroughExtension: ~
     DMore\ChromeExtension\Behat\ServiceContainer\ChromeExtension: ~
 local: # (google-chrome-stable --remote-debugging-port=9221 &) && socat tcp-l:9222,fork TCP4:127.0.0.1:9221

src/spryker/application/skeleton/composer-harness.json

@@ -5,18 +5,17 @@
   "require": {
   },
   "require-dev": {
-    "codeception/codeception": "~2.5.6",
     "behat/behat": "^3.5",
     "behat/mink": "^1.7",
     "behat/mink-extension": "^2.3",
     "behat/mink-goutte-driver": "^1.2",
     "ciaranmcnulty/behat-stepthroughextension": "^1.0",
     "dmore/behat-chrome-extension": "^1.3",
     "dmore/chrome-mink-driver": "^2.6",
-    "friends-of-behat/context-service-extension": "^1.2",
-    "friends-of-behat/cross-container-extension": "^1.1",
     "phpcompatibility/php-compatibility": "dev-master",
-    "sensiolabs/behat-page-object-extension": "^2.3"
+    "sensiolabs/behat-page-object-extension": "^2.3",
+    "guzzlehttp/guzzle": "^6.3.0",
+    "symfony/browser-kit": "^4.4"
   },
   "autoload-dev": {
     "psr-4": {

src/spryker/application/skeleton/config/Shared/config_local.php

@@ -13,7 +13,6 @@
 use Spryker\Shared\Newsletter\NewsletterConstants;
 use Spryker\Shared\ProductManagement\ProductManagementConstants;
 use Spryker\Shared\Propel\PropelConstants;
-use Spryker\Shared\PropelQueryBuilder\PropelQueryBuilderConstants;
 use Spryker\Shared\RabbitMq\RabbitMqEnv;
 use Spryker\Shared\Router\RouterConstants;
 use Spryker\Shared\Scheduler\SchedulerConstants;
@@ -34,12 +33,12 @@
 $config[ApplicationConstants::BASE_URL_YVES] = sprintf(
     'http://%s%s',
     $config[ApplicationConstants::HOST_YVES],
-    $config[ApplicationConstants::PORT_YVES]
+    ''
 );
 $config[ApplicationConstants::BASE_URL_SSL_YVES] = sprintf(
     'https://%s%s',
     $config[ApplicationConstants::HOST_YVES],
-    $config[ApplicationConstants::PORT_SSL_YVES]
+    ''
 );
 $config[ProductManagementConstants::BASE_URL_YVES] = $config[ApplicationConstants::BASE_URL_YVES];
 $config[NewsletterConstants::BASE_URL_YVES] = $config[ApplicationConstants::BASE_URL_YVES];
@@ -61,12 +60,12 @@
 $config[ApplicationConstants::BASE_URL_ZED] = sprintf(
     'http://%s%s',
     $config[ApplicationConstants::HOST_ZED],
-    $config[ApplicationConstants::PORT_ZED]
+    ''
 );
 $config[ApplicationConstants::BASE_URL_SSL_ZED] = sprintf(
     'https://%s%s',
     $config[ApplicationConstants::HOST_ZED],
-    $config[ApplicationConstants::PORT_SSL_ZED]
+    ''
 );
 $config[ZedRequestConstants::HOST_ZED_API] = $config[ApplicationConstants::HOST_ZED];
 $config[ZedRequestConstants::BASE_URL_ZED_API] = $config[ApplicationConstants::BASE_URL_ZED];
@@ -104,9 +103,6 @@
 $config[PropelConstants::ZED_DB_DATABASE] = getenv('DB_NAME');
 $config[PropelConstants::ZED_DB_HOST] = getenv('DB_HOST');
 $config[PropelConstants::ZED_DB_PORT] = 5432;
-$config[PropelConstants::ZED_DB_ENGINE]
-    = $config[PropelQueryBuilderConstants::ZED_DB_ENGINE]
-    = $config[PropelConstants::ZED_DB_ENGINE_PGSQL];
 $config[PropelConstants::USE_SUDO_TO_MANAGE_DATABASE] = false;
 
 // ---------- Elasticsearch
@@ -201,7 +197,6 @@
 $config[KernelConstants::DOMAIN_WHITELIST] = [];
 
 // ---------- Namespaces
-$config[KernelConstants::PROJECT_NAMESPACE] = 'Inviqa';
 $config[KernelConstants::PROJECT_NAMESPACES] = [
     'Inviqa',
     'Pyz',

src/spryker/application/skeleton/config/install/docker.yml.twig

@@ -45,12 +45,31 @@ sections:
         remove-cache:
             command: "vendor/bin/console cache:empty-all"
 
-        remove-generated-files:
-            command: "vendor/bin/console setup:empty-generated-directory"
+        remove-auto-completion:
+            command: "if [ \"$APPLICATION_ENV\" = \"development\" ]; then vendor/bin/console dev:ide-auto-completion:remove; fi"
+
+        remove-request-validation-cache:
+            command: "vendor/bin/console rest-api:remove-validation-cache"
+            stores: true
+
+        remove-navigation-cache:
+            command: "vendor/bin/console navigation:cache:remove"
+
+        remove-source-map:
+            command: "vendor/bin/console search:source-map:remove"
+
+        remove-databuilder:
+            command: "if [ \"$APPLICATION_ENV\" = \"development\" ]; then vendor/bin/console transfer:databuilder:remove; fi"
+
+        remove-entity-transfer:
+            command: "vendor/bin/console transfer:entity:remove"
+
+        remove-transfer:
+            command: "vendor/bin/console transfer:remove"
 
     generate:
         prepare-propel:
-            command: "vendor/bin/console setup:deploy:prepare-propel"
+            command: "vendor/bin/console propel:deploy:prepare"
 
         generate-transfers:
             command: "vendor/bin/console transfer:generate"
@@ -68,7 +87,7 @@ sections:
             command: "if [ \"$APPLICATION_ENV\" = \"development\" ]; then vendor/bin/console transfer:databuilder:generate; fi"
 
         generate-ide-auto-completion:
-            command: "if [ \"$APPLICATION_ENV\" = \"development\" ]; then vendor/bin/console dev:ide:generate-auto-completion; fi"
+            command: "if [ \"$APPLICATION_ENV\" = \"development\" ]; then vendor/bin/console dev:ide-auto-completion:generate; fi"
 
     scheduler-down:
         scheduler-stop:
@@ -89,7 +108,11 @@ sections:
             command: "vendor/bin/console navigation:build-cache"
 
         rest-request-validation-cache-warmup:
-            command: "vendor/bin/console glue:rest:build-request-validation-cache"
+            command: "vendor/bin/console rest-api:build-request-validation-cache"
+            stores: true
+
+        class-resolver-build:
+            command: "vendor/bin/console cache:class-resolver:build"
 
     queue-flush:
         set-permissions:
@@ -209,7 +232,7 @@ sections:
 
     demodata:
         import:
-            command: "vendor/bin/console data:import"
+            command: "vendor/bin/console data:import --config=data/import/local/full_EU.yml"
             stores:
                 - DE
 

src/spryker/harness.yml

@@ -26,13 +26,15 @@ attributes:
   spryker:
     salt: 2tkqCCRKy5rT4wMVz8KTCh8r3sJGkL5v
     demoshop-url: https://github.com/spryker-shop/b2c-demo-shop.git
-    demoshop-version: 202001.0-p1
+    demoshop-version: "202009.0"
     mode: development
+    oauth_client_secret: ~
+    zed_request_token: ~
   php:
     fpm:
       ini:
         max_execution_time: 600
-    version: 7.2
+    version: 7.4
     ini:
       opcache.max_accelerated_files: 65407
   database:
@@ -80,7 +82,7 @@ attributes:
       php-fpm: "= 'my127/spryker:' ~ @('php.version') ~ '-fpm-' ~ (@('php.version') >= 7.4 ? 'buster' : 'stretch')"
   elasticsearch:
     image: elasticsearch
-    tag: 5.6
+    tag: 6.8.12
   redis:
     protocol: redis
   rabbitmq:

src/spryker/harness/attributes/docker.yml

@@ -13,6 +13,11 @@ attributes:
         JENKINS_EXTERNAL_HOST: = @('jenkins.external_host')
       environment_secrets:
         SPRYKER_SALT: = @('spryker.salt')
+        SPRYKER_OAUTH_CLIENT_IDENTIFIER: "frontend"
+        # not required for development env, must be set for remote (recommended size: 48)
+        SPRYKER_OAUTH_CLIENT_SECRET: "= env('SPRYKER_OAUTH_CLIENT_SECRET') ? env('SPRYKER_OAUTH_CLIENT_SECRET') : @('spryker.oauth_client_secret')"
+        # not required for development env, must be set for remote (recommended size: 80)
+        SPRYKER_ZED_REQUEST_TOKEN: "= env('SPRYKER_ZED_REQUEST_TOKEN') ? env('SPRYKER_ZED_REQUEST_TOKEN') : @('spryker.zed_request_token')"
     jenkins:
       enabled: "= 'jenkins' in @('app.services')"
       image: jenkins:alpine
@@ -27,6 +32,8 @@ attributes:
         RABBITMQ_DEFAULT_USER: spryker
       environment_secrets:
         RABBITMQ_DEFAULT_PASS: spryker
+    redis:
+      image: redis:5-alpine
 
   pipeline:
     base: