Support Spryker 202009 release

.gitignore

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

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": {
@@ -39,6 +38,9 @@
       "APPLICATION_ENV=development vendor/bin/console transfer:generate",
       "APPLICATION_ENV=development vendor/bin/console dev:ide:generate-auto-completion"
     ],
+    "phpstan": [
+      "php -d memory_limit=1024M vendor/bin/phpstan analyze -c phpstan.neon src/ -l 4"
+    ],
     "test-production-quality": [
       "bash -e -o pipefail -c \"find src/ -type f -name '*.php' -print0 | xargs -0 --no-run-if-empty -n 1 -P 8 -i php -l {} | (grep -v 'No syntax errors detected' || echo OK)\""
     ],

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

@@ -3,6 +3,7 @@
 use Pyz\Shared\Queue\QueueConstants;
 use Pyz\Shared\Scheduler\SchedulerConfig;
 use Spryker\Shared\Application\ApplicationConstants;
+use Spryker\Shared\Auth\AuthConstants;
 use Spryker\Shared\Collector\CollectorConstants;
 use Spryker\Shared\Customer\CustomerConstants;
 use Spryker\Shared\GlueApplication\GlueApplicationConstants;
@@ -11,9 +12,9 @@
 use Spryker\Shared\Kernel\Store;
 use Spryker\Shared\Mail\MailConstants;
 use Spryker\Shared\Newsletter\NewsletterConstants;
+use Spryker\Shared\Oauth\OauthConstants;
 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 +35,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 +62,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 +105,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,8 +199,16 @@
 $config[KernelConstants::DOMAIN_WHITELIST] = [];
 
 // ---------- Namespaces
-$config[KernelConstants::PROJECT_NAMESPACE] = 'Inviqa';
 $config[KernelConstants::PROJECT_NAMESPACES] = [
     'Inviqa',
     'Pyz',
 ];
+
+// ---------- OAUTH
+$config[OauthConstants::OAUTH_CLIENT_IDENTIFIER] = 'frontend';
+// todo: convert below credentials to environment variables with encrypted secrets
+$config[OauthConstants::PRIVATE_KEY_PATH] = 'file://' . APPLICATION_ROOT_DIR . '/config/Zed/dev_only_private.key';
+$config[OauthConstants::PUBLIC_KEY_PATH] = 'file://' . APPLICATION_ROOT_DIR . '/config/Zed/dev_only_public.key';
+$config[OauthConstants::ENCRYPTION_KEY] = '6Go9YRlbogOQyHpGDkydw8ejC0Z36FboKkFL7mybT0mxB3Oz';
+$config[OauthConstants::OAUTH_CLIENT_SECRET] = 'xN7uUeDzDpYtlp6oTrtC6aHGdA9Cy0gjF6hDaatiRkNyHEoc';
+$config[AuthConstants::AUTH_DEFAULT_CREDENTIALS]['yves_system']['token'] = 'VEOJWp1gsANquUEiGT7pUJdmmS0cnLLCZZKZoiRUAGRyZtUUhNVuTUSeJ8Zz1i5N7ddwv9shJXGTwVmB';

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,7 +26,7 @@ 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
   php:
     fpm: